diff --git a/.changeset/funny-items-check.md b/.changeset/funny-items-check.md new file mode 100644 index 0000000000..7f8cba8032 --- /dev/null +++ b/.changeset/funny-items-check.md @@ -0,0 +1,5 @@ +--- +"effect": minor +--- + +change `FiberSet` type parameters order from `FiberSet` to `FiberSet` diff --git a/packages/effect/mod.sh b/packages/effect/mod.sh index cf0a298205..f2857cf163 100755 --- a/packages/effect/mod.sh +++ b/packages/effect/mod.sh @@ -1,5 +1,5 @@ #!/bin/bash -dirs=(../effect/src) +dirs=(../effect/test) for dir in ${dirs[@]}; do echo Refactoring $dir diff --git a/packages/effect/mod.ts b/packages/effect/mod.ts index fed5ac76bd..fdcdc3f5ce 100644 --- a/packages/effect/mod.ts +++ b/packages/effect/mod.ts @@ -9,7 +9,8 @@ const enabled = { swapTDeferredParams: false, swapTakeParams: false, swapFiberParams: false, - swapRuntimeFiberParams: true, + swapRuntimeFiberParams: false, + swapFiberSetParams: true, cleanupSTM: false, cleanupEffect: false, cleanupStream: false, @@ -95,6 +96,7 @@ const swapTDeferredParams = swapParamsEA("TDeferred") const swapTakeParams = swapParamsEA("Take") const swapFiberParams = swapParamsEA("Fiber") const swapRuntimeFiberParams = swapParamsEA("FiberRuntime") +const swapFiberSetParams = swapParamsEA("FiberSet") const swapSTMParams = swapParamsREA("STM") const swapSTMGenParams = swapParamsREA("STMGen") @@ -149,6 +151,9 @@ export default function transformer(file: cs.FileInfo, api: cs.API) { if (enabled.swapRuntimeFiberParams) { swapRuntimeFiberParams(ast) } + if (enabled.swapFiberSetParams) { + swapFiberSetParams(ast) + } if (enabled.cleanupEffect) { cleanupEffect(ast) } diff --git a/packages/effect/src/Deferred.ts b/packages/effect/src/Deferred.ts index 3732bad725..ea32f09218 100644 --- a/packages/effect/src/Deferred.ts +++ b/packages/effect/src/Deferred.ts @@ -37,9 +37,9 @@ export type DeferredTypeId = typeof DeferredTypeId * @since 2.0.0 * @category models */ -export interface Deferred extends Deferred.Variance, Pipeable { +export interface Deferred extends Deferred.Variance, Pipeable { /** @internal */ - readonly state: MutableRef.MutableRef> + readonly state: MutableRef.MutableRef> /** @internal */ readonly blockingOn: FiberId.FiberId } @@ -52,10 +52,10 @@ export declare namespace Deferred { * @since 2.0.0 * @category models */ - export interface Variance { + export interface Variance { readonly [DeferredTypeId]: { - readonly _E: Types.Invariant readonly _A: Types.Invariant + readonly _E: Types.Invariant } } } diff --git a/packages/effect/src/Effect.ts b/packages/effect/src/Effect.ts index fecad0c265..4d4a706ca8 100644 --- a/packages/effect/src/Effect.ts +++ b/packages/effect/src/Effect.ts @@ -2693,7 +2693,7 @@ export const forkWithErrorHandler: { * @since 2.0.0 * @category supervision & fibers */ -export const fromFiber: (fiber: Fiber.Fiber) => Effect = circular.fromFiber +export const fromFiber: (fiber: Fiber.Fiber) => Effect = circular.fromFiber /** * Creates an `Effect` value that represents the exit value of the specified @@ -3319,7 +3319,7 @@ export const exit: (self: Effect) => Effect, n * @category conversions */ export const intoDeferred: { - (deferred: Deferred.Deferred): (self: Effect) => Effect + (deferred: Deferred.Deferred): (self: Effect) => Effect (self: Effect, deferred: Deferred.Deferred): Effect } = core.intoDeferred @@ -4703,7 +4703,7 @@ export const makeSemaphore: (permits: number) => Effect = circular.ma * @since 2.0.0 * @category execution */ -export const runFork: ( +export const runFork: ( effect: Effect, options?: Runtime.RunForkOptions ) => Fiber.RuntimeFiber = _runtime.unsafeForkEffect @@ -4712,7 +4712,7 @@ export const runFork: ( * @since 2.0.0 * @category execution */ -export const runCallback: ( +export const runCallback: ( effect: Effect, options?: Runtime.RunCallbackOptions | undefined ) => Runtime.Cancel = _runtime.unsafeRunEffect @@ -4724,7 +4724,7 @@ export const runCallback: ( * @since 2.0.0 * @category execution */ -export const runPromise: (effect: Effect) => Promise = _runtime.unsafeRunPromiseEffect +export const runPromise: (effect: Effect) => Promise = _runtime.unsafeRunPromiseEffect /** * Runs an `Effect` workflow, returning a `Promise` which resolves with the @@ -4733,20 +4733,20 @@ export const runPromise: (effect: Effect) => Promise = _runtime.u * @since 2.0.0 * @category execution */ -export const runPromiseExit: (effect: Effect) => Promise> = +export const runPromiseExit: (effect: Effect) => Promise> = _runtime.unsafeRunPromiseExitEffect /** * @since 2.0.0 * @category execution */ -export const runSync: (effect: Effect) => A = _runtime.unsafeRunSyncEffect +export const runSync: (effect: Effect) => A = _runtime.unsafeRunSyncEffect /** * @since 2.0.0 * @category execution */ -export const runSyncExit: (effect: Effect) => Exit.Exit = _runtime.unsafeRunSyncExitEffect +export const runSyncExit: (effect: Effect) => Exit.Exit = _runtime.unsafeRunSyncExitEffect // ------------------------------------------------------------------------------------- // zipping diff --git a/packages/effect/src/FiberSet.ts b/packages/effect/src/FiberSet.ts index c6d244ac50..ec246e69c0 100644 --- a/packages/effect/src/FiberSet.ts +++ b/packages/effect/src/FiberSet.ts @@ -26,7 +26,9 @@ export type TypeId = typeof TypeId * @since 2.0.0 * @categories models */ -export interface FiberSet extends Pipeable, Inspectable.Inspectable, Iterable> { +export interface FiberSet + extends Pipeable, Inspectable.Inspectable, Iterable> +{ readonly [TypeId]: TypeId readonly backing: Set> } @@ -59,7 +61,7 @@ const Proto = { } } -const unsafeMake = (): FiberSet => { +const unsafeMake = (): FiberSet => { const self = Object.create(Proto) self.backing = new Set() return self @@ -90,8 +92,8 @@ const unsafeMake = (): FiberSet => { * @since 2.0.0 * @categories constructors */ -export const make = (): Effect.Effect, never, Scope.Scope> => - Effect.acquireRelease(Effect.sync(() => unsafeMake()), clear) +export const make = (): Effect.Effect, never, Scope.Scope> => + Effect.acquireRelease(Effect.sync(() => unsafeMake()), clear) /** * Create an Effect run function that is backed by a FiberSet. @@ -99,7 +101,7 @@ export const make = (): Effect.Effect, never, Scope.Scope> * @since 2.0.0 * @categories constructors */ -export const makeRuntime = (): Effect.Effect< +export const makeRuntime = (): Effect.Effect< ( effect: Effect.Effect, options?: Runtime.RunForkOptions | undefined @@ -108,7 +110,7 @@ export const makeRuntime = (): Effect.Effect< Scope.Scope | R > => Effect.flatMap( - make(), + make(), (self) => runtime(self)() ) @@ -119,14 +121,14 @@ export const makeRuntime = (): Effect.Effect< * @categories combinators */ export const unsafeAdd: { - (fiber: Fiber.RuntimeFiber): (self: FiberSet) => void - (self: FiberSet, fiber: Fiber.RuntimeFiber): void + (fiber: Fiber.RuntimeFiber): (self: FiberSet) => void + (self: FiberSet, fiber: Fiber.RuntimeFiber): void } = dual< - ( + ( fiber: Fiber.RuntimeFiber - ) => (self: FiberSet) => void, - ( - self: FiberSet, + ) => (self: FiberSet) => void, + ( + self: FiberSet, fiber: Fiber.RuntimeFiber ) => void >(2, (self, fiber) => { @@ -146,19 +148,19 @@ export const unsafeAdd: { * @categories combinators */ export const add: { - ( + ( fiber: Fiber.RuntimeFiber - ): (self: FiberSet) => Effect.Effect - ( - self: FiberSet, + ): (self: FiberSet) => Effect.Effect + ( + self: FiberSet, fiber: Fiber.RuntimeFiber ): Effect.Effect } = dual< - ( + ( fiber: Fiber.RuntimeFiber - ) => (self: FiberSet) => Effect.Effect, - ( - self: FiberSet, + ) => (self: FiberSet) => Effect.Effect, + ( + self: FiberSet, fiber: Fiber.RuntimeFiber ) => Effect.Effect >(2, (self, fiber) => Effect.sync(() => unsafeAdd(self, fiber))) @@ -167,7 +169,7 @@ export const add: { * @since 2.0.0 * @categories combinators */ -export const clear = (self: FiberSet): Effect.Effect => +export const clear = (self: FiberSet): Effect.Effect => Effect.zipRight( Effect.forEach(self.backing, (fiber) => Fiber.interrupt(fiber)), Effect.sync(() => { @@ -183,11 +185,11 @@ export const clear = (self: FiberSet): Effect.Effect => * @categories combinators */ export const run: { - (self: FiberSet): ( + (self: FiberSet): ( effect: Effect.Effect ) => Effect.Effect, never, R> - ( - self: FiberSet, + ( + self: FiberSet, effect: Effect.Effect ): Effect.Effect, never, R> } = function() { @@ -232,16 +234,16 @@ export const run: { * @since 2.0.0 * @categories combinators */ -export const runtime: ( - self: FiberSet -) => () => Effect.Effect< +export const runtime: ( + self: FiberSet +) => () => Effect.Effect< ( effect: Effect.Effect, options?: Runtime.RunForkOptions | undefined ) => Fiber.RuntimeFiber, never, R -> = (self: FiberSet) => () => +> = (self: FiberSet) => () => Effect.map( Effect.runtime(), (runtime) => { @@ -261,4 +263,4 @@ export const runtime: ( * @since 2.0.0 * @categories combinators */ -export const size = (self: FiberSet): Effect.Effect => Effect.sync(() => self.backing.size) +export const size = (self: FiberSet): Effect.Effect => Effect.sync(() => self.backing.size) diff --git a/packages/effect/src/Runtime.ts b/packages/effect/src/Runtime.ts index 850fab47b3..4ce04b95d3 100644 --- a/packages/effect/src/Runtime.ts +++ b/packages/effect/src/Runtime.ts @@ -71,7 +71,7 @@ export interface RunForkOptions { */ export const runFork: ( runtime: Runtime -) => (self: Effect.Effect, options?: RunForkOptions) => Fiber.RuntimeFiber = internal.unsafeFork +) => (self: Effect.Effect, options?: RunForkOptions) => Fiber.RuntimeFiber = internal.unsafeFork /** * Executes the effect synchronously returning the exit. @@ -82,7 +82,7 @@ export const runFork: ( * @since 2.0.0 * @category execution */ -export const runSyncExit: (runtime: Runtime) => (effect: Effect.Effect) => Exit.Exit = +export const runSyncExit: (runtime: Runtime) => (effect: Effect.Effect) => Exit.Exit = internal.unsafeRunSyncExit /** @@ -94,7 +94,7 @@ export const runSyncExit: (runtime: Runtime) => (effect: Effect.Effe * @since 2.0.0 * @category execution */ -export const runSync: (runtime: Runtime) => (effect: Effect.Effect) => A = internal.unsafeRunSync +export const runSync: (runtime: Runtime) => (effect: Effect.Effect) => A = internal.unsafeRunSync /** * @since 2.0.0 @@ -133,7 +133,7 @@ export const runCallback: ( * @since 2.0.0 * @category execution */ -export const runPromise: (runtime: Runtime) => (effect: Effect.Effect) => Promise = +export const runPromise: (runtime: Runtime) => (effect: Effect.Effect) => Promise = internal.unsafeRunPromise /** @@ -148,7 +148,7 @@ export const runPromise: (runtime: Runtime) => (effect: Effect.Effec */ export const runPromiseExit: ( runtime: Runtime -) => (effect: Effect.Effect) => Promise> = internal.unsafeRunPromiseExit +) => (effect: Effect.Effect) => Promise> = internal.unsafeRunPromiseExit /** * @since 2.0.0 diff --git a/packages/effect/src/STM.ts b/packages/effect/src/STM.ts index b845a39fb8..fe7faa73af 100644 --- a/packages/effect/src/STM.ts +++ b/packages/effect/src/STM.ts @@ -446,7 +446,7 @@ export const commitEither: (self: STM) => Effect.Effect(predicate: LazyArg, error: LazyArg, result: LazyArg) => STM = stm.cond +export const cond: (predicate: LazyArg, error: LazyArg, result: LazyArg) => STM = stm.cond /** * Retrieves the environment inside an stm. @@ -482,8 +482,8 @@ export const contextWithSTM: ( * @category context */ export const mapInputContext: { - (f: (context: Context.Context) => Context.Context): (self: STM) => STM - (self: STM, f: (context: Context.Context) => Context.Context): STM + (f: (context: Context.Context) => Context.Context): (self: STM) => STM + (self: STM, f: (context: Context.Context) => Context.Context): STM } = core.mapInputContext /** @@ -1481,8 +1481,8 @@ export const partition: { * @category context */ export const provideContext: { - (env: Context.Context): (self: STM) => STM - (self: STM, env: Context.Context): STM + (env: Context.Context): (self: STM) => STM + (self: STM, env: Context.Context): STM } = stm.provideContext /** diff --git a/packages/effect/src/Stream.ts b/packages/effect/src/Stream.ts index 74cc1b254f..1d1ca393d6 100644 --- a/packages/effect/src/Stream.ts +++ b/packages/effect/src/Stream.ts @@ -1414,7 +1414,7 @@ export const forever: (self: Stream) => Stream = inte * @since 2.0.0 * @category constructors */ -export const fromAsyncIterable: (iterable: AsyncIterable, onError: (e: unknown) => E) => Stream = +export const fromAsyncIterable: (iterable: AsyncIterable, onError: (e: unknown) => E) => Stream = internal.fromAsyncIterable /** @@ -2566,8 +2566,8 @@ export const prepend: { * @category context */ export const provideContext: { - (context: Context.Context): (self: Stream) => Stream - (self: Stream, context: Context.Context): Stream + (context: Context.Context): (self: Stream) => Stream + (self: Stream, context: Context.Context): Stream } = internal.provideContext /** @@ -2577,8 +2577,8 @@ export const provideContext: { * @category context */ export const provideLayer: { - (layer: Layer.Layer): (self: Stream) => Stream - (self: Stream, layer: Layer.Layer): Stream + (layer: Layer.Layer): (self: Stream) => Stream + (self: Stream, layer: Layer.Layer): Stream } = internal.provideLayer /** @@ -2646,8 +2646,8 @@ export const provideServiceStream: { * @category context */ export const mapInputContext: { - (f: (env: Context.Context) => Context.Context): (self: Stream) => Stream - (self: Stream, f: (env: Context.Context) => Context.Context): Stream + (f: (env: Context.Context) => Context.Context): (self: Stream) => Stream + (self: Stream, f: (env: Context.Context) => Context.Context): Stream } = internal.mapInputContext /** @@ -3180,7 +3180,7 @@ export const runHead: (self: Stream) => Effect.Effect(pubsub: PubSub.PubSub>): (self: Stream) => Effect.Effect + (pubsub: PubSub.PubSub>): (self: Stream) => Effect.Effect (self: Stream, pubsub: PubSub.PubSub>): Effect.Effect } = internal.runIntoPubSub @@ -3192,7 +3192,7 @@ export const runIntoPubSub: { * @category destructors */ export const runIntoPubSubScoped: { - ( + ( pubsub: PubSub.PubSub> ): (self: Stream) => Effect.Effect (self: Stream, pubsub: PubSub.PubSub>): Effect.Effect @@ -3206,7 +3206,7 @@ export const runIntoPubSubScoped: { * @category destructors */ export const runIntoQueue: { - (queue: Queue.Enqueue>): (self: Stream) => Effect.Effect + (queue: Queue.Enqueue>): (self: Stream) => Effect.Effect (self: Stream, queue: Queue.Enqueue>): Effect.Effect } = internal.runIntoQueue @@ -3218,7 +3218,7 @@ export const runIntoQueue: { * @category destructors */ export const runIntoQueueElementsScoped: { - ( + ( queue: Queue.Enqueue>> ): (self: Stream) => Effect.Effect ( @@ -3235,7 +3235,7 @@ export const runIntoQueueElementsScoped: { * @category destructors */ export const runIntoQueueScoped: { - ( + ( queue: Queue.Enqueue> ): (self: Stream) => Effect.Effect (self: Stream, queue: Queue.Enqueue>): Effect.Effect diff --git a/packages/effect/src/Supervisor.ts b/packages/effect/src/Supervisor.ts index 83161a252c..b323dcab70 100644 --- a/packages/effect/src/Supervisor.ts +++ b/packages/effect/src/Supervisor.ts @@ -59,17 +59,17 @@ export interface Supervisor extends Supervisor.Variance { /** * Supervises the execution of an `Effect` by a `Fiber`. */ - onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void + onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void /** * Supervises the suspension of a computation running within a `Fiber`. */ - onSuspend(fiber: Fiber.RuntimeFiber): void + onSuspend(fiber: Fiber.RuntimeFiber): void /** * Supervises the resumption of a computation running within a `Fiber`. */ - onResume(fiber: Fiber.RuntimeFiber): void + onResume(fiber: Fiber.RuntimeFiber): void /** * Maps this supervisor to another one, which has the same effect, but whose @@ -183,7 +183,7 @@ export abstract class AbstractSupervisor implements Supervisor { /** * @since 2.0.0 */ - onEffect( + onEffect( _fiber: Fiber.RuntimeFiber, _effect: Effect.Effect ): void { @@ -193,7 +193,7 @@ export abstract class AbstractSupervisor implements Supervisor { /** * @since 2.0.0 */ - onSuspend( + onSuspend( _fiber: Fiber.RuntimeFiber ): void { // @@ -202,7 +202,7 @@ export abstract class AbstractSupervisor implements Supervisor { /** * @since 2.0.0 */ - onResume( + onResume( _fiber: Fiber.RuntimeFiber ): void { // diff --git a/packages/effect/src/internal/core.ts b/packages/effect/src/internal/core.ts index 778e310a52..93d36d25ea 100644 --- a/packages/effect/src/internal/core.ts +++ b/packages/effect/src/internal/core.ts @@ -975,7 +975,7 @@ export const interruptibleMask = ( /* @internal */ export const intoDeferred: { - (deferred: Deferred.Deferred): (self: Effect.Effect) => Effect.Effect + (deferred: Deferred.Deferred): (self: Effect.Effect) => Effect.Effect (self: Effect.Effect, deferred: Deferred.Deferred): Effect.Effect } = dual( 2, @@ -3021,7 +3021,7 @@ export const contextWithEffect = ( /* @internal */ export const provideContext = dual< - (context: Context.Context) => (self: Effect.Effect) => Effect.Effect, + (context: Context.Context) => (self: Effect.Effect) => Effect.Effect, (self: Effect.Effect, context: Context.Context) => Effect.Effect >(2, (self: Effect.Effect, context: Context.Context) => fiberRefLocally( @@ -3058,7 +3058,7 @@ export const mapInputContext = dual< // ----------------------------------------------------------------------------- /** @internal */ -export const currentSpanFromFiber = (fiber: Fiber.RuntimeFiber): Option.Option => { +export const currentSpanFromFiber = (fiber: Fiber.RuntimeFiber): Option.Option => { const span = fiber.getFiberRef(currentContext).unsafeMap.get(internalTracer.spanTag.key) as | Tracer.ParentSpan | undefined diff --git a/packages/effect/src/internal/deferred.ts b/packages/effect/src/internal/deferred.ts index d1b934a691..a1c1df1e00 100644 --- a/packages/effect/src/internal/deferred.ts +++ b/packages/effect/src/internal/deferred.ts @@ -19,28 +19,28 @@ export const deferredVariance = { } /** @internal */ -export type State = Pending | Done +export type State = Pending | Done /** @internal */ -export interface Pending { +export interface Pending { readonly _tag: "Pending" readonly joiners: Array<(effect: Effect.Effect) => void> } /** @internal */ -export interface Done { +export interface Done { readonly _tag: "Done" readonly effect: Effect.Effect } /** @internal */ -export const pending = ( +export const pending = ( joiners: Array<(effect: Effect.Effect) => void> -): State => { +): State => { return { _tag: OpCodes.OP_STATE_PENDING, joiners } } /** @internal */ -export const done = (effect: Effect.Effect): State => { +export const done = (effect: Effect.Effect): State => { return { _tag: OpCodes.OP_STATE_DONE, effect } } diff --git a/packages/effect/src/internal/effect/circular.ts b/packages/effect/src/internal/effect/circular.ts index 8fbcf043d3..e984d467b7 100644 --- a/packages/effect/src/internal/effect/circular.ts +++ b/packages/effect/src/internal/effect/circular.ts @@ -199,7 +199,7 @@ const getCachedValue = ( ) /** @internal */ -const invalidateCache = ( +const invalidateCache = ( cache: Synchronized.SynchronizedRef]>> ): Effect.Effect => internalRef.set(cache, Option.none()) @@ -291,7 +291,7 @@ export const forkScoped = ( fiberRuntime.scopeWith((scope) => forkIn(self, scope)) /** @internal */ -export const fromFiber = (fiber: Fiber.Fiber): Effect.Effect => internalFiber.join(fiber) +export const fromFiber = (fiber: Fiber.Fiber): Effect.Effect => internalFiber.join(fiber) /** @internal */ export const fromFiberEffect = (fiber: Effect.Effect, E, R>): Effect.Effect => diff --git a/packages/effect/src/internal/fiberRuntime.ts b/packages/effect/src/internal/fiberRuntime.ts index 6b967226e1..a6d2736842 100644 --- a/packages/effect/src/internal/fiberRuntime.ts +++ b/packages/effect/src/internal/fiberRuntime.ts @@ -311,7 +311,7 @@ export class FiberRuntime implements Fiber.RuntimeFi * background. This can be called to "kick off" execution of a fiber after * it has been created. */ - resume(effect: Effect.Effect): void { + resume(effect: Effect.Effect): void { this.tell(FiberMessage.resume(effect)) } diff --git a/packages/effect/src/internal/runtime.ts b/packages/effect/src/internal/runtime.ts index 7c19b83640..d251e358ae 100644 --- a/packages/effect/src/internal/runtime.ts +++ b/packages/effect/src/internal/runtime.ts @@ -28,7 +28,7 @@ import * as _supervisor from "./supervisor.js" /** @internal */ export const unsafeFork = (runtime: Runtime.Runtime) => -( +( self: Effect.Effect, options?: Runtime.RunForkOptions ): Fiber.RuntimeFiber => { @@ -122,7 +122,7 @@ export const unsafeRunCallback = (runtime: Runtime.Runtime) => } /** @internal */ -export const unsafeRunSync = (runtime: Runtime.Runtime) => (effect: Effect.Effect): A => { +export const unsafeRunSync = (runtime: Runtime.Runtime) => (effect: Effect.Effect): A => { const result = unsafeRunSyncExit(runtime)(effect) if (result._tag === "Failure") { throw fiberFailure(result.i0) @@ -131,7 +131,7 @@ export const unsafeRunSync = (runtime: Runtime.Runtime) => (effect: } } -const asyncFiberException = (fiber: Fiber.RuntimeFiber): Runtime.AsyncFiberException => { +const asyncFiberException = (fiber: Fiber.RuntimeFiber): Runtime.AsyncFiberException => { const limit = Error.stackTraceLimit Error.stackTraceLimit = 0 const error = (new Error()) as any @@ -240,7 +240,7 @@ const fastPath = (effect: Effect.Effect): Exit.Exit | un /** @internal */ export const unsafeRunSyncExit = - (runtime: Runtime.Runtime) => (effect: Effect.Effect): Exit.Exit => { + (runtime: Runtime.Runtime) => (effect: Effect.Effect): Exit.Exit => { const op = fastPath(effect) if (op) { return op @@ -257,7 +257,7 @@ export const unsafeRunSyncExit = /** @internal */ export const unsafeRunPromise = - (runtime: Runtime.Runtime) => (effect: Effect.Effect): Promise => + (runtime: Runtime.Runtime) => (effect: Effect.Effect): Promise => unsafeRunPromiseExit(runtime)(effect).then((result) => { switch (result._tag) { case OpCodes.OP_SUCCESS: { @@ -271,7 +271,7 @@ export const unsafeRunPromise = /** @internal */ export const unsafeRunPromiseExit = - (runtime: Runtime.Runtime) => (effect: Effect.Effect): Promise> => + (runtime: Runtime.Runtime) => (effect: Effect.Effect): Promise> => new Promise((resolve) => { const op = fastPath(effect) if (op) { diff --git a/packages/effect/src/internal/stm/core.ts b/packages/effect/src/internal/stm/core.ts index d596b00981..2c68851f0f 100644 --- a/packages/effect/src/internal/stm/core.ts +++ b/packages/effect/src/internal/stm/core.ts @@ -599,10 +599,10 @@ export const catchAll = dual< export const mapInputContext = dual< ( f: (context: Context.Context) => Context.Context - ) => ( + ) => ( self: STM.STM ) => STM.STM, - ( + ( self: STM.STM, f: (context: Context.Context) => Context.Context ) => STM.STM diff --git a/packages/effect/src/internal/stm/stm.ts b/packages/effect/src/internal/stm/stm.ts index 739ec19620..c9b7e5fa5d 100644 --- a/packages/effect/src/internal/stm/stm.ts +++ b/packages/effect/src/internal/stm/stm.ts @@ -309,7 +309,7 @@ export const commitEither = (self: STM.STM): Effect.Effect( +export const cond = ( predicate: LazyArg, error: LazyArg, result: LazyArg @@ -971,8 +971,8 @@ export const orElseSucceed = dual< /** @internal */ export const provideContext = dual< - (env: Context.Context) => (self: STM.STM) => STM.STM, - (self: STM.STM, env: Context.Context) => STM.STM + (env: Context.Context) => (self: STM.STM) => STM.STM, + (self: STM.STM, env: Context.Context) => STM.STM >(2, (self, env) => core.mapInputContext(self, (_: Context.Context) => env)) /** @internal */ diff --git a/packages/effect/src/internal/stream.ts b/packages/effect/src/internal/stream.ts index 118d50c1f2..6ec100a290 100644 --- a/packages/effect/src/internal/stream.ts +++ b/packages/effect/src/internal/stream.ts @@ -2826,7 +2826,7 @@ export const forever = (self: Stream.Stream): Stream.Stream( +export const fromAsyncIterable = ( iterable: AsyncIterable, onError: (e: unknown) => E ) => @@ -4569,11 +4569,11 @@ export const prepend = dual< /** @internal */ export const provideContext = dual< - (context: Context.Context) => (self: Stream.Stream) => Stream.Stream, - (self: Stream.Stream, context: Context.Context) => Stream.Stream + (context: Context.Context) => (self: Stream.Stream) => Stream.Stream, + (self: Stream.Stream, context: Context.Context) => Stream.Stream >( 2, - (self: Stream.Stream, context: Context.Context): Stream.Stream => + (self: Stream.Stream, context: Context.Context): Stream.Stream => new StreamImpl(pipe(toChannel(self), core.provideContext(context))) ) @@ -4581,14 +4581,14 @@ export const provideContext = dual< export const provideLayer = dual< ( layer: Layer.Layer - ) => (self: Stream.Stream) => Stream.Stream, - ( + ) => (self: Stream.Stream) => Stream.Stream, + ( self: Stream.Stream, layer: Layer.Layer ) => Stream.Stream >( 2, - ( + ( self: Stream.Stream, layer: Layer.Layer ): Stream.Stream => @@ -4670,14 +4670,14 @@ export const provideServiceStream = dual< export const mapInputContext = dual< ( f: (env: Context.Context) => Context.Context - ) => (self: Stream.Stream) => Stream.Stream, - ( + ) => (self: Stream.Stream) => Stream.Stream, + ( self: Stream.Stream, f: (env: Context.Context) => Context.Context ) => Stream.Stream >( 2, - ( + ( self: Stream.Stream, f: (env: Context.Context) => Context.Context ): Stream.Stream => contextWithStream((env) => pipe(self, provideContext(f(env)))) @@ -5383,7 +5383,7 @@ export const runHead = (self: Stream.Stream): Effect.Effect(pubsub: PubSub.PubSub>) => (self: Stream.Stream) => Effect.Effect, + (pubsub: PubSub.PubSub>) => (self: Stream.Stream) => Effect.Effect, (self: Stream.Stream, pubsub: PubSub.PubSub>) => Effect.Effect >( 2, @@ -5393,7 +5393,7 @@ export const runIntoPubSub = dual< /** @internal */ export const runIntoPubSubScoped = dual< - ( + ( pubsub: PubSub.PubSub> ) => (self: Stream.Stream) => Effect.Effect, ( @@ -5407,7 +5407,7 @@ export const runIntoPubSubScoped = dual< /** @internal */ export const runIntoQueue = dual< - (queue: Queue.Enqueue>) => (self: Stream.Stream) => Effect.Effect, + (queue: Queue.Enqueue>) => (self: Stream.Stream) => Effect.Effect, (self: Stream.Stream, queue: Queue.Enqueue>) => Effect.Effect >( 2, @@ -5417,7 +5417,7 @@ export const runIntoQueue = dual< /** @internal */ export const runIntoQueueElementsScoped = dual< - ( + ( queue: Queue.Enqueue>> ) => (self: Stream.Stream) => Effect.Effect, ( @@ -5448,7 +5448,7 @@ export const runIntoQueueElementsScoped = dual< /** @internal */ export const runIntoQueueScoped = dual< - ( + ( queue: Queue.Enqueue> ) => (self: Stream.Stream) => Effect.Effect, ( diff --git a/packages/effect/src/internal/stream/pull.ts b/packages/effect/src/internal/stream/pull.ts index 2f8108085e..2f1d8e3c42 100644 --- a/packages/effect/src/internal/stream/pull.ts +++ b/packages/effect/src/internal/stream/pull.ts @@ -29,6 +29,6 @@ export const failCause = (cause: Cause.Cause): Effect.Effect( +export const fromDequeue = ( dequeue: Queue.Dequeue> ): Effect.Effect, Option.Option> => Effect.flatMap(Queue.take(dequeue), take.done) diff --git a/packages/effect/src/internal/supervisor.ts b/packages/effect/src/internal/supervisor.ts index 5c021715ee..4a6dd9586d 100644 --- a/packages/effect/src/internal/supervisor.ts +++ b/packages/effect/src/internal/supervisor.ts @@ -48,19 +48,19 @@ export class ProxySupervisor implements Supervisor.Supervisor { this.underlying.onStart(context, effect, parent, fiber) } - onEnd(value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { + onEnd(value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { this.underlying.onEnd(value, fiber) } - onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void { + onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void { this.underlying.onEffect(fiber, effect) } - onSuspend(fiber: Fiber.RuntimeFiber): void { + onSuspend(fiber: Fiber.RuntimeFiber): void { this.underlying.onSuspend(fiber) } - onResume(fiber: Fiber.RuntimeFiber): void { + onResume(fiber: Fiber.RuntimeFiber): void { this.underlying.onResume(fiber) } @@ -98,22 +98,22 @@ export class Zip implements Supervisor.Supervisor(value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { + onEnd(value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { this.left.onEnd(value, fiber) this.right.onEnd(value, fiber) } - onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void { + onEffect(fiber: Fiber.RuntimeFiber, effect: Effect.Effect): void { this.left.onEffect(fiber, effect) this.right.onEffect(fiber, effect) } - onSuspend(fiber: Fiber.RuntimeFiber): void { + onSuspend(fiber: Fiber.RuntimeFiber): void { this.left.onSuspend(fiber) this.right.onSuspend(fiber) } - onResume(fiber: Fiber.RuntimeFiber): void { + onResume(fiber: Fiber.RuntimeFiber): void { this.left.onResume(fiber) this.right.onResume(fiber) } @@ -150,19 +150,19 @@ export class Track implements Supervisor.Supervisor(_value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { + onEnd(_value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { this.fibers.delete(fiber) } - onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { + onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { // } - onSuspend(_fiber: Fiber.RuntimeFiber): void { + onSuspend(_fiber: Fiber.RuntimeFiber): void { // } - onResume(_fiber: Fiber.RuntimeFiber): void { + onResume(_fiber: Fiber.RuntimeFiber): void { // } @@ -201,19 +201,19 @@ export class Const implements Supervisor.Supervisor { // } - onEnd(_value: Exit.Exit, _fiber: Fiber.RuntimeFiber): void { + onEnd(_value: Exit.Exit, _fiber: Fiber.RuntimeFiber): void { // } - onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { + onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { // } - onSuspend(_fiber: Fiber.RuntimeFiber): void { + onSuspend(_fiber: Fiber.RuntimeFiber): void { // } - onResume(_fiber: Fiber.RuntimeFiber): void { + onResume(_fiber: Fiber.RuntimeFiber): void { // } @@ -249,19 +249,19 @@ class FibersIn implements Supervisor.Supervisor(_value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { + onEnd(_value: Exit.Exit, fiber: Fiber.RuntimeFiber): void { pipe(this.ref, MutableRef.set(pipe(MutableRef.get(this.ref), SortedSet.remove(fiber)))) } - onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { + onEffect(_fiber: Fiber.RuntimeFiber, _effect: Effect.Effect): void { // } - onSuspend(_fiber: Fiber.RuntimeFiber): void { + onSuspend(_fiber: Fiber.RuntimeFiber): void { // } - onResume(_fiber: Fiber.RuntimeFiber): void { + onResume(_fiber: Fiber.RuntimeFiber): void { // }