@typed/fx 1.0.14 → 1.0.16

package/src/operator/exhaustMap.test.ts

@@ -2,7 +2,7 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import { pipe } from '@fp-ts/core/Function'
-import * as Duration from '@fp-ts/data/Duration'
+import * as Duration from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { fromIterable } from '../constructor/fromIterable.js'

package/src/operator/exhaustMap.ts

@@ -2,14 +2,17 @@ import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import type * as Fiber from '@effect/io/Fiber'
 import * as Ref from '@effect/io/Ref/Synchronized'
-import { pipe } from '@fp-ts/core/Function'
+import { dual, pipe } from '@fp-ts/core/Function'
+import type { FlatMap } from '@fp-ts/core/typeclass/FlatMap'
 
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'
+import type { FxTypeLambda } from '../typeclass/TypeLambda.js'
 
-export function exhaustMap<A, R2, E2, B>(f: (a: A) => Fx<R2, E2, B>) {
-  return <R, E>(fx: Fx<R, E, A>): Fx<R | R2, E | E2, B> => new ExhaustMapFx(fx, f)
-}
+export const exhaustMap: FlatMap<FxTypeLambda>['flatMap'] = dual(
+  2,
+  <R, E, A, R2, E2, B>(fx: Fx<R, E, A>, f: (a: A) => Fx<R2, E2, B>) => new ExhaustMapFx(fx, f),
+)
 
 class ExhaustMapFx<R, E, A, R2, E2, B>
   extends Fx.Variance<R | R2, E | E2, B>

package/src/operator/exhaustMapLatest.test.ts

@@ -2,7 +2,7 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import { pipe } from '@fp-ts/core/Function'
-import * as Duration from '@fp-ts/data/Duration'
+import * as Duration from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { fromIterable } from '../constructor/fromIterable.js'

package/src/operator/flatMap.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/flatMap.ts

@@ -1,15 +1,16 @@
 import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
-import { identity, pipe } from '@fp-ts/core/Function'
+import { dual, identity, pipe } from '@fp-ts/core/Function'
+import type { FlatMap } from '@fp-ts/core/typeclass/FlatMap'
 
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'
+import type { FxTypeLambda } from '../index.js'
 
-export function flatMap<A, R2, E2, B>(
-  f: (a: A) => Fx<R2, E2, B>,
-): <R, E>(fx: Fx<R, E, A>) => Fx<R | R2, E | E2, B> {
-  return (fx) => new FlatMapFx(fx, f)
-}
+export const flatMap: FlatMap<FxTypeLambda>['flatMap'] = dual(
+  2,
+  <R, E, A, R2, E2, B>(fx: Fx<R, E, A>, f: (a: A) => Fx<R2, E2, B>) => new FlatMapFx(fx, f),
+)
 
 export const flatten: <R, E, R2, E2, A>(fx: Fx<R, E, Fx<R2, E2, A>>) => Fx<R | R2, E | E2, A> =
   flatMap(identity)

package/src/operator/flatMapConcurrently.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/hold.test.ts

@@ -2,7 +2,7 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
-import { millis } from '@fp-ts/data/Duration'
+import { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/hold.ts

@@ -4,7 +4,7 @@ import * as Fiber from '@effect/io/Fiber'
 import type { Scope } from '@effect/io/Scope'
 import { pipe } from '@fp-ts/core/Function'
 import * as Option from '@fp-ts/core/Option'
-import * as MutableRef from '@fp-ts/data/MutableRef'
+import * as MutableRef from '@effect/data/MutableRef'
 
 import type { Fx } from '../Fx.js'
 import { asap } from '../_internal/RefCounter.js'

package/src/operator/index.ts

@@ -3,6 +3,7 @@ export * from './asUnit.js'
 export * from './catchAll.js'
 export * from './catchAllCause.js'
 export * from './catchAllDefect.js'
+export * from './catchTag.js'
 export * from './combine.js'
 export * from './compact.js'
 export * from './concatMap.js'

package/src/operator/map.ts

@@ -1,8 +1,11 @@
+import { dual } from '@fp-ts/core/Function'
+
 import { Fx } from '../Fx.js'
 
-export function map<A, B>(f: (a: A) => B) {
-  return <R, E>(fx: Fx<R, E, A>): Fx<R, E, B> => new MapFx(fx, f)
-}
+export const map: {
+  <R, E, A, B>(fx: Fx<R, E, A>, f: (a: A) => B): Fx<R, E, B>
+  <A, B>(f: (a: A) => B): <R, E>(fx: Fx<R, E, A>) => Fx<R, E, B>
+} = dual(2, <R, E, A, B>(fx: Fx<R, E, A>, f: (a: A) => B) => new MapFx(fx, f))
 
 class MapFx<R, E, A, B> extends Fx.Variance<R, E, B> implements Fx<R, E, B> {
   constructor(readonly fx: Fx<R, E, A>, readonly f: (a: A) => B) {

package/src/operator/merge.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/mergeRace.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/multicast.test.ts

@@ -3,7 +3,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { fromIterable } from '../constructor/fromIterable.js'

package/src/operator/multicast.ts

@@ -5,7 +5,7 @@ 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 type { Context } from '@effect/data/Context'
 
 import { Fx } from '../Fx.js'
 import { asap } from '../_internal/RefCounter.js'

package/src/operator/onInterrupt.ts

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

package/src/operator/provideContext.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 * as Context from '@fp-ts/data/Context'
+import * as Context from '@effect/data/Context'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/provideService.test.ts

@@ -2,7 +2,7 @@ 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 { Tag } from '@effect/data/Context'
 import { describe, it } from 'vitest'
 
 import { serviceWith } from '../constructor/serviceWith.js'

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 type * as Context from '@effect/data/Context'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/provideServiceEffect.test.ts

@@ -2,7 +2,7 @@ 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 { Tag } from '@effect/data/Context'
 import { describe, it } from 'vitest'
 
 import { serviceWith } from '../constructor/serviceWith.js'

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 type * as Context from '@effect/data/Context'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/race.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/race.ts

@@ -4,7 +4,7 @@ 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 type { Chunk } from '@effect/data/Chunk'
 
 import { Fx } from '../Fx.js'
 import { asap } from '../_internal/RefCounter.js'

package/src/operator/scanEffect.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'

package/src/operator/separate.test.ts

@@ -3,7 +3,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/skipRepeats.ts

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

package/src/operator/snapshot.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/snapshotEffect.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/struct.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { periodic } from '../constructor/periodic.js'

package/src/operator/switchMap.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/switchMap.ts

@@ -2,16 +2,17 @@ import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
 import * as Ref from '@effect/io/Ref/Synchronized'
-import { flow, pipe, identity } from '@fp-ts/core/Function'
+import { flow, pipe, identity, dual } from '@fp-ts/core/Function'
+import type { FlatMap } from '@fp-ts/core/typeclass/FlatMap'
 
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'
+import type { FxTypeLambda } from '../typeclass/TypeLambda.js'
 
-export function switchMap<A, R2, E2, B>(
-  f: (a: A) => Fx<R2, E2, B>,
-): <R, E>(fx: Fx<R, E, A>) => Fx<R | R2, E | E2, B> {
-  return (fx) => new SwitchMapFx(fx, f)
-}
+export const switchMap: FlatMap<FxTypeLambda>['flatMap'] = dual(
+  2,
+  <R, E, A, R2, E2, B>(fx: Fx<R, E, A>, f: (a: A) => Fx<R2, E2, B>) => new SwitchMapFx(fx, f),
+)
 
 export const switchLatest: <R, E, R2, E2, A>(fx: Fx<R, E, Fx<R2, E2, A>>) => Fx<R | R2, E | E2, A> =
   switchMap(identity)

package/src/operator/switchMapCause.test.ts

@@ -4,7 +4,7 @@ import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import * as Either from '@fp-ts/core/Either'
 import { flow, pipe } from '@fp-ts/core/Function'
-import { millis } from '@fp-ts/data/Duration'
+import { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/switchMapCause.ts

@@ -7,12 +7,27 @@ import { flow, pipe } from '@fp-ts/core/Function'
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'
 
+import { catchTag_ } from './catchTag.js'
+
 export function switchMapCause<E, R2, E2, B>(
   f: (cause: Cause.Cause<E>) => Fx<R2, E2, B>,
 ): <R, A>(fx: Fx<R, E, A>) => Fx<R | R2, E2, A | B> {
   return (fx) => new SwitchMapCauseFx(fx, f)
 }
 
+export function switchMapCatchTag<
+  K extends E['_tag'] & string,
+  E extends { readonly _tag: string },
+  R2,
+  E2,
+  B,
+>(
+  k: K,
+  f: (e: Extract<E, { readonly _tag: K }>) => Fx<R2, E2, B>,
+): <R, A>(fx: Fx<R, E, A>) => Fx<R | R2, E2 | Exclude<E, { readonly _tag: K }>, A | B> {
+  return (fx) => new SwitchMapCauseFx(fx, (cause) => catchTag_(cause, k, f))
+}
+
 class SwitchMapCauseFx<R, E, A, R2, E2, B>
   extends Fx.Variance<R | R2, E2, A | B>
   implements Fx<R | R2, E2, A | B>

package/src/operator/switchMatch.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/throttle.test.ts

@@ -2,7 +2,7 @@ import { deepStrictEqual } from 'assert'
 
 import * as Effect from '@effect/io/Effect'
 import { pipe } from '@fp-ts/core/Function'
-import * as Duration from '@fp-ts/data/Duration'
+import * as Duration from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'

package/src/operator/throttle.ts

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

package/src/operator/zip.test.ts

@@ -2,7 +2,7 @@ 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 { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/typeclass/Bicovariant.ts

@@ -1,4 +1,4 @@
-import { pipe } from '@fp-ts/core/Function'
+import { dual, pipe } from '@fp-ts/core/Function'
 import * as B from '@fp-ts/core/typeclass/Bicovariant'
 
 import type { Fx } from '../Fx.js'
@@ -7,8 +7,14 @@ import { mapError } from '../operator/mapError.js'
 
 import type { FxTypeLambda } from './TypeLambda.js'
 
+export const bimap: B.Bicovariant<FxTypeLambda>['bimap'] = dual(
+  3,
+  <R, E, A, E2, B>(self: Fx<R, E, A>, f: (e: E) => E2, g: (a: A) => B) =>
+    pipe(self, mapError(f), map(g)),
+)
+
 export const Bicovariant: B.Bicovariant<FxTypeLambda> = {
-  bimap: (f, g) => (fa) => pipe(fa, mapError(f), map(g)),
+  bimap,
 }
 
 export const mapLeft: <E1, E2>(f: (e: E1) => E2) => <R, A>(self: Fx<R, E1, A>) => Fx<R, E2, A> =

package/src/typeclass/Covariant.ts

@@ -5,7 +5,10 @@ import { map } from '../operator/map.js'
 
 import type { FxTypeLambda } from './TypeLambda.js'
 
-export const Covariant: C.Covariant<FxTypeLambda> = C.make((f) => map(f))
+export const Covariant: C.Covariant<FxTypeLambda> = {
+  map,
+  imap: C.imap<FxTypeLambda>(map),
+}
 
 export const flap: <A>(a: A) => <R, E, B>(self: Fx<R, E, (a: A) => B>) => Fx<R, E, B> =
   C.flap(Covariant)

package/src/typeclass/SemiProduct.ts

@@ -1,15 +1,21 @@
+import { dual } from '@fp-ts/core/Function'
 import * as SP from '@fp-ts/core/typeclass/SemiProduct'
 
+import type { Fx } from '../Fx.js'
 import { combine } from '../operator/combine.js'
 
 import { Covariant } from './Covariant.js'
 import type { FxTypeLambda } from './TypeLambda.js'
 
+export const product: SP.SemiProduct<FxTypeLambda>['product'] = dual(
+  2,
+  <R, E, A, R2, E2, B>(self: Fx<R, E, A>, that: Fx<R2, E2, B>) => combine(that)(self),
+)
+
+export const productMany = SP.productMany<FxTypeLambda>(Covariant.map, product)
+
 export const SemiProduct: SP.SemiProduct<FxTypeLambda> = {
-  product: ((s, o) => combine(o)(s)) as SP.SemiProduct<FxTypeLambda>['product'],
-  productMany: SP.productMany<FxTypeLambda>(
-    Covariant,
-    (s, o) => combine(o)(s) as any,
-  ) as SP.SemiProduct<FxTypeLambda>['productMany'],
+  product,
+  productMany,
   imap: Covariant.imap,
 }