@typed/fx 1.0.9 → 1.0.11

package/src/operator/loop.test.ts

@@ -1,7 +1,7 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'
@@ -17,7 +17,7 @@ describe(import.meta.url, () => {
         loop(0, (acc, n) => [(acc + n).toString(), acc + n]),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, ['1', '3', '6'])
     })

package/src/operator/map.test.ts

@@ -1,7 +1,7 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'
@@ -17,7 +17,7 @@ describe(import.meta.url, () => {
         map((x) => x + 1),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [2, 3, 4])
     })

package/src/operator/mapCause.test.ts

@@ -3,8 +3,8 @@ import { deepStrictEqual, ok } from 'assert'
 import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import * as Exit from '@effect/io/Exit'
-import { pipe } from '@fp-ts/data/Function'
-import * as Option from '@fp-ts/data/Option'
+import { pipe } from '@fp-ts/core/Function'
+import * as Option from '@fp-ts/core/Option'
 import { describe, it } from 'vitest'
 
 import { fail } from '../constructor/fail.js'
@@ -16,7 +16,7 @@ describe(import.meta.url, () => {
   describe(mapCause.name, () => {
     it('transforms an Fx error', async () => {
       const test = pipe(fail(1), mapCause(Cause.map((x) => x + 1)), collectAll)
-      const exit = await Effect.unsafeRunPromiseExit(test)
+      const exit = await Effect.runPromiseExit(test)
 
       ok(Exit.isFailure(exit))
 

package/src/operator/mapCause.ts

@@ -1,5 +1,5 @@
 import type { Cause } from '@effect/io/Cause'
-import { flow } from '@fp-ts/data/Function'
+import { flow } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/merge.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { millis } from '@fp-ts/data/Duration'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'
@@ -23,7 +23,7 @@ describe(import.meta.url, () => {
         ),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [1, 3, 4, 2, 5])
     })

package/src/operator/merge.ts

@@ -1,5 +1,5 @@
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'

package/src/operator/mergeRace.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { millis } from '@fp-ts/data/Duration'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'
@@ -14,14 +14,14 @@ describe(import.meta.url, () => {
   describe(mergeRace.name, () => {
     it('interrupts the second Fx when the first emits', async () => {
       const test = pipe(at(millis(0), 1), mergeRace(at(millis(200), 2)), collectAll)
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [1])
     })
 
     it('emits both streams when second emits first', async () => {
       const test = pipe(at(millis(200), 1), mergeRace(at(millis(0), 2)), collectAll)
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [2, 1])
     })

package/src/operator/mergeRace.ts

@@ -1,7 +1,7 @@
 import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/multicast.test.ts

@@ -2,8 +2,8 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
+import { pipe } from '@fp-ts/core/Function'
 import { millis } from '@fp-ts/data/Duration'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { fromIterable } from '../constructor/fromIterable.js'
@@ -63,7 +63,7 @@ describe(import.meta.url, () => {
         deepStrictEqual(started, 1)
       })
 
-      await Effect.unsafeRunPromise(test)
+      await Effect.runPromise(test)
     })
   })
 })

package/src/operator/multicast.ts

@@ -4,8 +4,8 @@ import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
 import type { RuntimeFiber } from '@effect/io/Fiber'
 import type { Scope } from '@effect/io/Scope'
+import { pipe } from '@fp-ts/core/Function'
 import type { Context } from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 
 import { Fx } from '../Fx.js'
 import { asap } from '../_internal/RefCounter.js'
@@ -35,7 +35,7 @@ export class MulticastFx<R, E, A>
 
     return Effect.gen(function* ($) {
       const deferred = yield* $(Deferred.make<never, void>())
-      const context = yield* $(Effect.environment<R | R2>())
+      const context = yield* $(Effect.context<R | R2>())
       const observer: MulticastObserver<R2, E, A> = {
         sink,
         context,
@@ -56,18 +56,14 @@ export class MulticastFx<R, E, A>
 
   event(a: A) {
     return Effect.suspendSucceed(() =>
-      pipe(
-        this.observers.slice(),
-        Effect.forEachDiscard((observer) => this.runEvent(a, observer)),
-      ),
+      Effect.forEachDiscard(this.observers.slice(), (observer) => this.runEvent(a, observer)),
     )
   }
 
   error(cause: Cause<E>) {
     return Effect.suspendSucceed(() =>
       pipe(
-        this.observers.slice(),
-        Effect.forEachDiscard((observer) => this.runError(cause, observer)),
+        Effect.forEachDiscard(this.observers.slice(), (observer) => this.runError(cause, observer)),
         Effect.tap(() => this.cleanup()),
       ),
     )
@@ -84,13 +80,13 @@ export class MulticastFx<R, E, A>
   }
 
   protected runEvent(a: A, observer: MulticastObserver<any, E, A>) {
-    return pipe(observer.sink.event(a), Effect.provideEnvironment(observer.context))
+    return pipe(observer.sink.event(a), Effect.provideContext(observer.context))
   }
 
   protected runError(cause: Cause<E>, observer: MulticastObserver<any, E, A>) {
     return pipe(
       observer.sink.error(cause),
-      Effect.provideEnvironment(observer.context),
+      Effect.provideContext(observer.context),
       Effect.tap(() => Effect.sync(() => this.removeObserver(observer))),
       Effect.intoDeferred(observer.deferred),
     )
@@ -99,7 +95,7 @@ export class MulticastFx<R, E, A>
   protected runEnd(observer: MulticastObserver<any, E, A>) {
     return pipe(
       observer.sink.end,
-      Effect.provideEnvironment(observer.context),
+      Effect.provideContext(observer.context),
       Effect.tap(() => Effect.sync(() => this.removeObserver(observer))),
       Effect.intoDeferred(observer.deferred),
     )

package/src/operator/onDone.ts

@@ -1,7 +1,7 @@
 import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
-import * as Either from '@fp-ts/data/Either'
-import { flow, pipe } from '@fp-ts/data/Function'
+import * as Either from '@fp-ts/core/Either'
+import { flow, pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/onDoneCause.ts

@@ -1,6 +1,6 @@
 import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/onExit.ts

@@ -1,6 +1,6 @@
 import type * as Effect from '@effect/io/Effect'
 import * as Exit from '@effect/io/Exit'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/onInterrupt.ts

@@ -1,6 +1,6 @@
 import * as Effect from '@effect/io/Effect'
 import type { FiberId } from '@effect/io/Fiber/Id'
-import { flow, pipe } from '@fp-ts/data/Function'
+import { flow, pipe } from '@fp-ts/core/Function'
 import type { HashSet } from '@fp-ts/data/HashSet'
 
 import { Fx } from '../Fx.js'

package/src/operator/{provideEnvironment.ts → provideContext.ts}

@@ -1,15 +1,15 @@
 import * as Effect from '@effect/io/Effect'
 import type { Scope } from '@effect/io/Scope'
+import { pipe } from '@fp-ts/core/Function'
 import * as Context from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 
 import { Fx } from '../Fx.js'
 
-export function provideEnvironment<R>(context: Context.Context<R>) {
-  return <E, A>(self: Fx<R, E, A>): Fx<never, E, A> => new ProvideEnvironmentFx(self, context)
+export function provideContext<R>(context: Context.Context<R>) {
+  return <E, A>(self: Fx<R, E, A>): Fx<never, E, A> => new ProvideContextFx(self, context)
 }
 
-class ProvideEnvironmentFx<R, E, A> extends Fx.Variance<never, E, A> implements Fx<never, E, A> {
+class ProvideContextFx<R, E, A> extends Fx.Variance<never, E, A> implements Fx<never, E, A> {
   constructor(readonly self: Fx<R, E, A>, readonly context: Context.Context<R>) {
     super()
   }
@@ -17,7 +17,7 @@ class ProvideEnvironmentFx<R, E, A> extends Fx.Variance<never, E, A> implements
   run<R2>(sink: Fx.Sink<R2, E, A>) {
     return pipe(
       this.self.run(sink),
-      Effect.provideSomeEnvironment<R2 | Scope, R | R2 | Scope>(Context.merge(this.context)),
+      Effect.contramapContext<R2 | Scope, R | R2 | Scope>(Context.merge(this.context)),
     )
   }
 }

package/src/operator/provideLayer.ts

@@ -1,5 +1,5 @@
 import type { Layer } from '@effect/io/Layer'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/provideService.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { Tag } from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { serviceWith } from '../constructor/serviceWith.js'
@@ -30,7 +30,7 @@ describe(import.meta.url, () => {
         Foo.provide(42),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [42])
     })

package/src/operator/provideService.ts

@@ -1,6 +1,6 @@
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import type * as Context from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 
 import { Fx } from '../Fx.js'
 
@@ -20,6 +20,6 @@ class ProvideServiceFx<R, E, A, S>
   }
 
   run<R2>(sink: Fx.Sink<R2, E, A>) {
-    return pipe(this.self.run(sink), Effect.provideService(this.tag)(this.service))
+    return pipe(this.self.run(sink), Effect.provideService(this.tag, this.service))
   }
 }

package/src/operator/provideServiceEffect.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { Tag } from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { serviceWith } from '../constructor/serviceWith.js'
@@ -33,7 +33,7 @@ describe(import.meta.url, () => {
         Foo.provide(42),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [42])
     })

package/src/operator/provideServiceEffect.ts

@@ -1,7 +1,7 @@
 import * as Effect from '@effect/io/Effect'
 import type { Scope } from '@effect/io/Scope'
+import { pipe } from '@fp-ts/core/Function'
 import type * as Context from '@fp-ts/data/Context'
-import { pipe } from '@fp-ts/data/Function'
 
 import { Fx } from '../Fx.js'
 
@@ -28,7 +28,7 @@ class ProvideServiceEffectFx<R, E, A, R2, E2, S>
   run<R3>(sink: Fx.Sink<R3, E | E2, A>) {
     return pipe(
       this.self.run(sink),
-      Effect.provideServiceEffect(this.tag)(this.service),
+      Effect.provideServiceEffect(this.tag, this.service),
       Effect.matchCauseEffect(sink.error, Effect.succeed),
     ) as Effect.Effect<Exclude<R | R2 | R3 | Scope, S>, never, unknown>
   }

package/src/operator/provideSomeLayer.ts

@@ -1,6 +1,6 @@
 import * as Effect from '@effect/io/Effect'
 import type { Layer } from '@effect/io/Layer'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/race.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { millis } from '@fp-ts/data/Duration'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'
@@ -22,7 +22,7 @@ describe(import.meta.url, () => {
         ),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [1, 2])
     })

package/src/operator/race.ts

@@ -3,8 +3,8 @@ import * as Effect from '@effect/io/Effect'
 import * as ExecutionStrategy from '@effect/io/ExecutionStrategy'
 import * as Exit from '@effect/io/Exit'
 import * as Scope from '@effect/io/Scope'
+import { pipe } from '@fp-ts/core/Function'
 import type { Chunk } from '@fp-ts/data/Chunk'
-import { pipe } from '@fp-ts/data/Function'
 
 import { Fx } from '../Fx.js'
 import { asap } from '../_internal/RefCounter.js'
@@ -44,25 +44,20 @@ class RaceAllFx<Streams extends readonly Fx<any, any, any>[]>
 
     return Effect.gen(function* ($) {
       const fiberId = yield* $(Effect.fiberId())
-      const closeScope = Effect.forEachDiscard(Scope.close(Exit.failCause(interrupt(fiberId))))
       const scope = yield* $(Effect.scope())
 
       const scopes: Chunk<Scope.CloseableScope> = yield* $(
-        pipe(
-          streams,
-          Effect.forEachWithIndex((s, i) =>
-            pipe(
-              scope,
-              Scope.fork(ExecutionStrategy.sequential),
-              Effect.flatMap((scope) =>
-                pipe(
-                  s,
-                  tap(() => cleanupScopes(i)),
-                  run(sink.event, sink.error, sink.end),
-                  Effect.scheduleForked(asap), // Schedule starts so that all Scopes can be returned *before* attempting to cleanup
-                  Effect.as(scope),
-                  Effect.provideService(Scope.Tag)(scope),
-                ),
+        Effect.forEachWithIndex(streams, (s, i) =>
+          pipe(
+            Scope.fork(scope, ExecutionStrategy.sequential),
+            Effect.flatMap((scope) =>
+              pipe(
+                s,
+                tap(() => cleanupScopes(i)),
+                run(sink.event, sink.error, sink.end),
+                Effect.scheduleForked(asap), // Schedule starts so that all Scopes can be returned *before* attempting to cleanup
+                Effect.as(scope),
+                Effect.provideService(Scope.Tag, scope),
               ),
             ),
           ),
@@ -75,7 +70,11 @@ class RaceAllFx<Streams extends readonly Fx<any, any, any>[]>
 
           currentFibers.splice(i, 1)
 
-          return yield* $(closeScope(currentFibers))
+          return yield* $(
+            Effect.forEachDiscard(currentFibers, (s) =>
+              Scope.close(s, Exit.failCause(interrupt(fiberId))),
+            ),
+          )
         })
       }
     })

package/src/operator/sample.ts

@@ -1,4 +1,4 @@
-import { identity, pipe } from '@fp-ts/data/Function'
+import { identity, pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/sandbox.ts

@@ -1,5 +1,5 @@
 import type { Cause } from '@effect/io/Cause'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 import { fail } from '../constructor/fail.js'

package/src/operator/scan.test.ts

@@ -1,7 +1,7 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'
@@ -17,7 +17,7 @@ describe(import.meta.url, () => {
         scan(0, (acc, n) => acc + n),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [0, 1, 3, 6])
     })

package/src/operator/scan.ts

@@ -1,4 +1,4 @@
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/scanEffect.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
+import { pipe } from '@fp-ts/core/Function'
 import { millis } from '@fp-ts/data/Duration'
-import { pipe } from '@fp-ts/data/Function'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'
@@ -18,7 +18,7 @@ describe(import.meta.url, () => {
         scanEffect(Effect.succeed(0), (acc, n) => Effect.sync(() => acc + n)),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [0, 1, 3, 6])
     })
@@ -34,7 +34,7 @@ describe(import.meta.url, () => {
         ),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [0, 10, 30, 60])
     })

package/src/operator/scanEffect.ts

@@ -1,6 +1,6 @@
 import * as Effect from '@effect/io/Effect'
-import * as TSemaphore from '@effect/stm/TSemaphore'
-import { pipe } from '@fp-ts/data/Function'
+import type * as Scope from '@effect/io/Scope'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx, Sink } from '../Fx.js'
 
@@ -24,7 +24,9 @@ class ScanEffectFx<R, E, A, R2, E2, B, R3, E3>
     super()
   }
 
-  run<R4>(sink: Sink<R4, E | E2 | E3, B>) {
+  run<R4>(
+    sink: Sink<R4, E | E2 | E3, B>,
+  ): Effect.Effect<R | R2 | R3 | R4 | Scope.Scope, never, unknown> {
     return pipe(
       this.seed,
       Effect.matchCauseEffect(sink.error, (acc) =>
@@ -37,9 +39,9 @@ class ScanEffectFx<R, E, A, R2, E2, B, R3, E3>
   }
 }
 
-class ScanEffectSink<R, E, A, R2, E2, B, R3, E3, R4> implements Fx.Sink<R | R2 | R3 | R4, E, A> {
+class ScanEffectSink<E, A, E2, B, R3, E3, R4> implements Fx.Sink<R3 | R4, E, A> {
   protected acc: B = this.seed
-  protected semaphore = TSemaphore.unsafeMake(1)
+  protected semaphore = Effect.unsafeMakeSemaphore(1)
 
   constructor(
     readonly sink: Sink<R4, E | E2 | E3, B>,
@@ -47,7 +49,7 @@ class ScanEffectSink<R, E, A, R2, E2, B, R3, E3, R4> implements Fx.Sink<R | R2 |
     readonly f: (b: B, a: A) => Effect.Effect<R3, E3, B>,
   ) {}
 
-  event = (a: A) => {
+  event = (a: A): Effect.Effect<R3 | R4, never, unknown> => {
     return pipe(
       this.f(this.acc, a),
       Effect.matchCauseEffect(this.sink.error, (acc) => {
@@ -55,7 +57,7 @@ class ScanEffectSink<R, E, A, R2, E2, B, R3, E3, R4> implements Fx.Sink<R | R2 |
 
         return this.sink.event(acc)
       }),
-      TSemaphore.withPermit(this.semaphore),
+      this.semaphore.withPermits(1),
     )
   }
 

package/src/operator/separate.test.ts

@@ -2,8 +2,8 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
+import * as Either from '@fp-ts/core/Either'
 import { millis } from '@fp-ts/data/Duration'
-import * as Either from '@fp-ts/data/Either'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'
@@ -32,7 +32,7 @@ describe(import.meta.url, () => {
         deepStrictEqual(yield* $(Fiber.join(fiberRights)), [4, 2])
       })
 
-      await Effect.unsafeRunPromise(test)
+      await Effect.runPromise(test)
     })
   })
 })

package/src/operator/separate.ts

@@ -1,5 +1,5 @@
-import * as Either from '@fp-ts/data/Either'
-import { pipe } from '@fp-ts/data/Function'
+import * as Either from '@fp-ts/core/Either'
+import { pipe } from '@fp-ts/core/Function'
 
 import type { Fx } from '../Fx.js'
 

package/src/operator/since.ts

@@ -1,5 +1,5 @@
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 import { withEarlyExit } from '../_internal/earlyExit.js'

package/src/operator/skipAfter.test.ts

@@ -1,7 +1,7 @@
 import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/data/Function'
+import { pipe } from '@fp-ts/core/Function'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'
@@ -20,7 +20,7 @@ describe(import.meta.url, () => {
         skipAfter((x) => x === 4),
         collectAll,
       )
-      const events = await Effect.unsafeRunPromise(test)
+      const events = await Effect.runPromise(test)
 
       deepStrictEqual(events, [1, 2, 3])
       deepStrictEqual(count, 8)

package/src/operator/skipAfter.ts

@@ -1,5 +1,5 @@
 import { unit } from '@effect/io/Effect'
-import type { Predicate } from '@fp-ts/data/Predicate'
+import type { Predicate } from '@fp-ts/core/Predicate'
 
 import { Fx } from '../Fx.js'