@typed/fx 1.0.16 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/fx",
-  "version": "1.0.16",
+  "version": "1.1.1",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -9,19 +9,20 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/cjs/index.js",
       "types": "./dist/index.d.ts"
     },
     "./*": {
       "import": "./dist/*.js",
+      "require": "./dist/cjs/*.js",
       "types": "./dist/*.d.ts"
     }
   },
   "dependencies": {
-    "@effect/data": "^0.1.0",
-    "@effect/io": "^0.1.11",
-    "@fp-ts/core": "^0.2.1"
+    "@effect/data": "^0.2.0",
+    "@effect/io": "^0.3.0"
   },
-  "gitHead": "ad0d7e329d68d45bdcdac5635a98f11a5fdd8f07",
+  "gitHead": "2e967d18abce5136dcabbb6e03cb28be95accc79",
   "publishConfig": {
     "access": "public"
   },

package/project.json

@@ -21,6 +21,18 @@
     },
     "test": {
       "executor": "@nrwl/vite:test"
+    },
+    "build:cjs": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          {
+            "command": "tsc --build packages/fx/tsconfig.cjs.build.json"
+          }
+        ],
+        "parallel": false
+      },
+      "outputs": ["{projectRoot}/dist/cjs"]
     }
   }
 }

package/src/Fx.ts

@@ -1,7 +1,7 @@
+import { identity } from '@effect/data/Function'
 import type { Cause } from '@effect/io/Cause'
 import type { Effect } from '@effect/io/Effect'
 import type { Scope } from '@effect/io/Scope'
-import { identity } from '@fp-ts/core/Function'
 
 export interface Fx<R, E, A> extends Fx.Variance<R, E, A> {
   /**

package/src/Subject/HoldSubject.test.ts

@@ -1,8 +1,8 @@
 import { deepStrictEqual } from 'assert'
 
+import { millis } from '@effect/data/Duration'
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
-import { millis } from '@effect/data/Duration'
 import { describe, it } from 'vitest'
 
 import { collectAll } from '../run/collectAll.js'

package/src/Subject/HoldSubject.ts

@@ -1,7 +1,7 @@
-import * as Effect from '@effect/io/Effect'
-import { identity } from '@fp-ts/core/Function'
-import { type Option, none } from '@fp-ts/core/Option'
+import { identity } from '@effect/data/Function'
 import { type MutableRef, make } from '@effect/data/MutableRef'
+import { type Option, none } from '@effect/data/Option'
+import * as Effect from '@effect/io/Effect'
 
 import type { Fx, Sink } from '../Fx.js'
 import { never } from '../constructor/never.js'

package/src/Subject/RefSubject.ts

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

package/src/Subject/Subject.ts

@@ -1,4 +1,4 @@
-import { identity } from '@fp-ts/core/Function'
+import { identity } from '@effect/data/Function'
 
 import { Fx, isFx, Sink } from '../Fx.js'
 import { never } from '../constructor/never.js'

package/src/Subject/SynchronizedSubject.ts

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

package/src/_internal/RefCounter.ts

@@ -1,11 +1,11 @@
+import { millis } from '@effect/data/Duration'
+import { pipe } from '@effect/data/Function'
 import * as Deferred from '@effect/io/Deferred'
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
 import * as Ref from '@effect/io/Ref'
 import * as Schedule from '@effect/io/Schedule'
 import type { Scope } from '@effect/io/Scope'
-import { pipe } from '@fp-ts/core/Function'
-import { millis } from '@effect/data/Duration'
 
 export const asap = pipe(
   Schedule.once(),

package/src/_internal/earlyExit.ts

@@ -1,5 +1,5 @@
+import { pipe } from '@effect/data/Function'
 import * as Effect from '@effect/io/Effect'
-import { pipe } from '@fp-ts/core/Function'
 
 export function withEarlyExit<R, E, A, R2, E2, B>(
   f: (_: Effect.Effect<never, never, never>) => Effect.Effect<R, E, A>,

package/src/constructor/acquireUseRelease.ts

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

package/src/constructor/async.ts

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

package/src/constructor/asyncEffect.ts

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

package/src/constructor/asyncOption.ts

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

package/src/constructor/at.ts

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

package/src/constructor/die.ts

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

package/src/constructor/dieMessage.ts

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

package/src/constructor/dieSync.ts

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

package/src/constructor/done.ts

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

package/src/constructor/fail.ts

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

package/src/constructor/failCause.ts

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

package/src/constructor/failCauseSync.ts

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

package/src/constructor/fromArray.ts

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

package/src/constructor/fromEffect.ts

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

package/src/constructor/fromEither.ts

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

package/src/constructor/fromEitherCause.ts

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

package/src/constructor/fromEmitter.ts

@@ -1,10 +1,11 @@
+import { pipe } from '@effect/data/Function'
 import type { Cause } from '@effect/io/Cause'
 import * as Deferred from '@effect/io/Deferred'
 import * as Effect from '@effect/io/Effect'
 import * as Exit from '@effect/io/Exit'
 import * as Fiber from '@effect/io/Fiber'
+import * as Runtime from '@effect/io/Runtime'
 import type { Scope } from '@effect/io/Scope'
-import { pipe } from '@fp-ts/core/Function'
 
 import { Fx } from '../Fx.js'
 
@@ -36,9 +37,9 @@ class FromEmitterFx<R, E, E2, A>
       const deferred = yield* $(Deferred.make<never, Exit.Exit<E | E2, void>>())
       const done = (exit: Exit.Exit<E | E2, void>) => Deferred.done(Exit.succeed(exit))(deferred)
       const emitter: Emitter<E, A> = {
-        emit: (a) => runtime.unsafeFork(sink.event(a)),
-        failCause: (e) => runtime.unsafeFork(done(Exit.failCause(e))),
-        end: () => runtime.unsafeFork(done(Exit.succeed(undefined))),
+        emit: (a) => Runtime.runFork(runtime)(sink.event(a)),
+        failCause: (e) => Runtime.runFork(runtime)(done(Exit.failCause(e))),
+        end: () => Runtime.runFork(runtime)(done(Exit.succeed(undefined))),
       }
 
       const fiber = yield* $(

package/src/constructor/fromFiber.ts

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

package/src/constructor/fromFiberEffect.ts

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

package/src/constructor/fromFxEffect.ts

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

package/src/constructor/fromOption.ts

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

package/src/constructor/periodic.ts

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

package/src/constructor/promise.ts

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

package/src/constructor/promiseAbort.ts

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

package/src/constructor/promiseFx.ts

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

package/src/constructor/random.ts

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

package/src/constructor/scheduled.ts

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

package/src/constructor/service.ts

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

package/src/constructor/serviceWith.ts

@@ -1,5 +1,5 @@
-import * as Effect from '@effect/io/Effect'
 import type { Tag } from '@effect/data/Context'
+import * as Effect from '@effect/io/Effect'
 
 import type { Fx } from '../Fx.js'
 

package/src/constructor/serviceWithEffect.ts

@@ -1,5 +1,5 @@
-import * as Effect from '@effect/io/Effect'
 import type { Tag } from '@effect/data/Context'
+import * as Effect from '@effect/io/Effect'
 
 import type { Fx } from '../Fx.js'
 

package/src/constructor/serviceWithFx.ts

@@ -1,5 +1,5 @@
-import * as Effect from '@effect/io/Effect'
 import type { Tag } from '@effect/data/Context'
+import * as Effect from '@effect/io/Effect'
 
 import { Fx } from '../Fx.js'
 

package/src/constructor/succeed.ts

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

package/src/constructor/sync.ts

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

package/src/constructor/tryCatchPromise.ts

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

package/src/constructor/tryCatchPromiseAbort.ts

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

package/src/constructor/tryPromise.ts

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

package/src/constructor/tryPromiseAbort.ts

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

package/src/operator/catchAll.ts

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

package/src/operator/catchAllCause.test.ts

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

package/src/operator/catchAllDefect.ts

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

package/src/operator/catchTag.ts

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

package/src/operator/combine.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 '@effect/data/Duration'
+import { pipe } from '@effect/data/Function'
+import * as Effect from '@effect/io/Effect'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/combine.ts

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

package/src/operator/compact.ts

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

package/src/operator/concatMap.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 '@effect/data/Duration'
+import { pipe } from '@effect/data/Function'
+import * as Effect from '@effect/io/Effect'
 import { describe, it } from 'vitest'
 
 import { at } from '../constructor/at.js'

package/src/operator/continueWith.test.ts

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

package/src/operator/contramapContext.ts

@@ -1,6 +1,6 @@
+import * as Context from '@effect/data/Context'
 import * as Effect from '@effect/io/Effect'
 import type { Scope } from '@effect/io/Scope'
-import * as Context from '@effect/data/Context'
 
 import { Fx } from '../Fx.js'
 

package/src/operator/debounce.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 * as Duration from '@effect/data/Duration'
+import { pipe } from '@effect/data/Function'
+import * as Effect from '@effect/io/Effect'
 import { describe, it } from 'vitest'
 
 import { fromArray } from '../constructor/fromArray.js'

package/src/operator/debounce.ts

@@ -1,8 +1,8 @@
+import type * as Duration from '@effect/data/Duration'
+import { pipe } from '@effect/data/Function'
 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/core/Function'
-import type * as Duration from '@effect/data/Duration'
 
 import { Fx } from '../Fx.js'
 import { withRefCounter } from '../_internal/RefCounter.js'

package/src/operator/delay.ts

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