Compare commits
6 Commits
28d32be057
...
205b95ad7e
| Author | SHA1 | Date | |
|---|---|---|---|
| 205b95ad7e | |||
| b9b9f37859 | |||
|
|
363c7d24f4 | ||
|
|
d57654d872 | ||
|
|
0b7d9383ec | ||
|
|
c380fe9d08 |
@@ -12,7 +12,7 @@ jobs:
|
|||||||
- name: Setup Node
|
- name: Setup Node
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
with:
|
with:
|
||||||
node-version: "22"
|
node-version: "24"
|
||||||
- name: Clone repo
|
- name: Clone repo
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
4
bun.lock
4
bun.lock
@@ -5,7 +5,7 @@
|
|||||||
"name": "@effect-fc/monorepo",
|
"name": "@effect-fc/monorepo",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "^2.2.5",
|
"@biomejs/biome": "^2.2.5",
|
||||||
"@effect/language-service": "^0.48.0",
|
"@effect/language-service": "^0.49.0",
|
||||||
"@types/bun": "^1.2.23",
|
"@types/bun": "^1.2.23",
|
||||||
"npm-check-updates": "^19.0.0",
|
"npm-check-updates": "^19.0.0",
|
||||||
"npm-sort": "^0.0.4",
|
"npm-sort": "^0.0.4",
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
|
|
||||||
"@effect-fc/example": ["@effect-fc/example@workspace:packages/example"],
|
"@effect-fc/example": ["@effect-fc/example@workspace:packages/example"],
|
||||||
|
|
||||||
"@effect/language-service": ["@effect/language-service@0.48.0", "", { "bin": { "effect-language-service": "cli.js" } }, "sha512-u7DTPoGFFeDGSdomjY5C2nCGNWSisxpYSqHp3dlSG8kCZh5cay+166bveHRYvuJSJS5yomdkPTJwjwrqMmT7Og=="],
|
"@effect/language-service": ["@effect/language-service@0.49.0", "", { "bin": { "effect-language-service": "cli.js" } }, "sha512-m4HGX4XO+ZHN0LZPH+rCQw8iutiFpuPKRuoZCuiyisLoXDpiKHQsIIEUrccDFo4i17nNbrgFdUyqxBJr/eSdnw=="],
|
||||||
|
|
||||||
"@effect/platform": ["@effect/platform@0.92.1", "", { "dependencies": { "find-my-way-ts": "^0.1.6", "msgpackr": "^1.11.4", "multipasta": "^0.2.7" }, "peerDependencies": { "effect": "^3.18.1" } }, "sha512-XXWCBVwyhaKZISN7aM1fv/3fWDGyxr84ObywnUrL8aHvJLoIeskWFAP/fqw3c5MFCrJ3ZV97RWLbv6JiBQugdg=="],
|
"@effect/platform": ["@effect/platform@0.92.1", "", { "dependencies": { "find-my-way-ts": "^0.1.6", "msgpackr": "^1.11.4", "multipasta": "^0.2.7" }, "peerDependencies": { "effect": "^3.18.1" } }, "sha512-XXWCBVwyhaKZISN7aM1fv/3fWDGyxr84ObywnUrL8aHvJLoIeskWFAP/fqw3c5MFCrJ3ZV97RWLbv6JiBQugdg=="],
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "^2.2.5",
|
"@biomejs/biome": "^2.2.5",
|
||||||
"@effect/language-service": "^0.48.0",
|
"@effect/language-service": "^0.49.0",
|
||||||
"@types/bun": "^1.2.23",
|
"@types/bun": "^1.2.23",
|
||||||
"npm-check-updates": "^19.0.0",
|
"npm-check-updates": "^19.0.0",
|
||||||
"npm-sort": "^0.0.4",
|
"npm-sort": "^0.0.4",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Cause, Effect, Equal, Exit, Hash, Match, Option, Pipeable, Predicate, pipe, Queue, type Scope } from "effect"
|
import { Cause, Context, Data, Effect, Equal, Exit, Hash, Layer, Match, Option, Pipeable, Predicate, pipe, Queue, Ref, type Scope } from "effect"
|
||||||
|
|
||||||
|
|
||||||
export const ResultTypeId: unique symbol = Symbol.for("@effect-fc/Result/Result")
|
export const ResultTypeId: unique symbol = Symbol.for("@effect-fc/Result/Result")
|
||||||
@@ -95,14 +95,9 @@ const ResultPrototype = Object.freeze({
|
|||||||
} as const satisfies Result.Prototype)
|
} as const satisfies Result.Prototype)
|
||||||
|
|
||||||
|
|
||||||
export interface ProgressService<P = never> {
|
|
||||||
readonly update: (progress: P) => Effect.Effect<void>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const isResult = (u: unknown): u is Result<unknown, unknown, unknown> => Predicate.hasProperty(u, ResultTypeId)
|
export const isResult = (u: unknown): u is Result<unknown, unknown, unknown> => Predicate.hasProperty(u, ResultTypeId)
|
||||||
export const isInitial = (u: unknown): u is Initial => isResult(u) && u._tag === "Initial"
|
export const isInitial = (u: unknown): u is Initial => isResult(u) && u._tag === "Initial"
|
||||||
export const isRunning = (u: unknown): u is Running => isResult(u) && u._tag === "Running"
|
export const isRunning = (u: unknown): u is Running<unknown> => isResult(u) && u._tag === "Running"
|
||||||
export const isSuccess = (u: unknown): u is Success<unknown> => isResult(u) && u._tag === "Success"
|
export const isSuccess = (u: unknown): u is Success<unknown> => isResult(u) && u._tag === "Success"
|
||||||
export const isFailure = (u: unknown): u is Failure<unknown, unknown> => isResult(u) && u._tag === "Failure"
|
export const isFailure = (u: unknown): u is Failure<unknown, unknown> => isResult(u) && u._tag === "Failure"
|
||||||
export const isRefreshing = (u: unknown): u is Refreshing<unknown> => isResult(u) && Predicate.hasProperty(u, "refreshing") && u.refreshing
|
export const isRefreshing = (u: unknown): u is Refreshing<unknown> => isResult(u) && Predicate.hasProperty(u, "refreshing") && u.refreshing
|
||||||
@@ -110,6 +105,7 @@ export const isRefreshing = (u: unknown): u is Refreshing<unknown> => isResult(u
|
|||||||
export const initial = (): Initial => Object.setPrototypeOf({ _tag: "Initial" }, ResultPrototype)
|
export const initial = (): Initial => Object.setPrototypeOf({ _tag: "Initial" }, ResultPrototype)
|
||||||
export const running = <P = never>(progress?: P): Running<P> => Object.setPrototypeOf({ _tag: "Running", progress }, ResultPrototype)
|
export const running = <P = never>(progress?: P): Running<P> => Object.setPrototypeOf({ _tag: "Running", progress }, ResultPrototype)
|
||||||
export const succeed = <A>(value: A): Success<A> => Object.setPrototypeOf({ _tag: "Success", value }, ResultPrototype)
|
export const succeed = <A>(value: A): Success<A> => Object.setPrototypeOf({ _tag: "Success", value }, ResultPrototype)
|
||||||
|
|
||||||
export const fail = <E, A = never>(
|
export const fail = <E, A = never>(
|
||||||
cause: Cause.Cause<E>,
|
cause: Cause.Cause<E>,
|
||||||
previousSuccess?: Success<A>,
|
previousSuccess?: Success<A>,
|
||||||
@@ -126,7 +122,6 @@ export const refreshing = <R extends Success<any> | Failure<any, any>, P = never
|
|||||||
Object.getPrototypeOf(result),
|
Object.getPrototypeOf(result),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
export const fromExit = <A, E>(
|
export const fromExit = <A, E>(
|
||||||
exit: Exit.Exit<A, E>
|
exit: Exit.Exit<A, E>
|
||||||
): Success<A> | Failure<A, E> => exit._tag === "Success"
|
): Success<A> | Failure<A, E> => exit._tag === "Success"
|
||||||
@@ -146,15 +141,89 @@ export const toExit = <A, E, P>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const forkEffectScoped = <A, E, R>(
|
|
||||||
effect: Effect.Effect<A, E, R>
|
export interface Progress<P = never> {
|
||||||
): Effect.Effect<Queue.Dequeue<Result<A, E>>, never, Scope.Scope | R> => Queue.unbounded<Result<A, E>>().pipe(
|
readonly update: <E, R>(
|
||||||
Effect.tap(Queue.offer(initial())),
|
f: (previous: P) => Effect.Effect<P, E, R>
|
||||||
Effect.tap(queue => Effect.forkScoped(Effect.addFinalizer(() => Queue.shutdown(queue)).pipe(
|
) => Effect.Effect<void, PreviousResultNotRunningOrRefreshing | E, R>
|
||||||
Effect.andThen(Queue.offer(queue, running())),
|
}
|
||||||
|
|
||||||
|
export class PreviousResultNotRunningOrRefreshing extends Data.TaggedError("@effect-fc/Result/PreviousResultNotRunningOrRefreshing")<{
|
||||||
|
readonly previous: Result<unknown, unknown, unknown>
|
||||||
|
}> {}
|
||||||
|
|
||||||
|
export const Progress = <P = never>(): Context.Tag<Progress<P>, Progress<P>> => Context.GenericTag("@effect-fc/Result/Progress")
|
||||||
|
|
||||||
|
export const makeProgressLayer = <A, E, P = never>(
|
||||||
|
queue: Queue.Enqueue<Result<A, E, P>>,
|
||||||
|
ref: Ref.Ref<Result<A, E, P>>,
|
||||||
|
): Layer.Layer<Progress<P>> => Layer.sync(Progress<P>(), () => ({
|
||||||
|
update: <E, R>(f: (previous: P) => Effect.Effect<P, E, R>) => Effect.Do.pipe(
|
||||||
|
Effect.bind("previous", () => Effect.andThen(
|
||||||
|
ref,
|
||||||
|
previous => isRunning(previous) || isRefreshing(previous)
|
||||||
|
? Effect.succeed(previous)
|
||||||
|
: Effect.fail(new PreviousResultNotRunningOrRefreshing({ previous })),
|
||||||
|
)),
|
||||||
|
Effect.bind("progress", ({ previous }) => f(previous.progress)),
|
||||||
|
Effect.let("next", ({ previous, progress }) => Object.setPrototypeOf(
|
||||||
|
Object.assign({}, previous, { progress }),
|
||||||
|
Object.getPrototypeOf(previous),
|
||||||
|
)),
|
||||||
|
Effect.tap(({ next }) => Ref.set(ref, next)),
|
||||||
|
Effect.tap(({ next }) => Queue.offer(queue, next)),
|
||||||
|
Effect.asVoid,
|
||||||
|
),
|
||||||
|
}))
|
||||||
|
|
||||||
|
|
||||||
|
export namespace forkEffectScoped {
|
||||||
|
export type ContextInput<R, P> = (R extends Progress<infer X>
|
||||||
|
? [X] extends [P]
|
||||||
|
? R
|
||||||
|
: never
|
||||||
|
: R
|
||||||
|
)
|
||||||
|
|
||||||
|
export interface Options<P = never> {
|
||||||
|
readonly initialProgress?: P
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const forkEffectScoped = <A, E, R, P = never>(
|
||||||
|
effect: Effect.Effect<A, E, forkEffectScoped.ContextInput<R, NoInfer<P>>>,
|
||||||
|
options?: forkEffectScoped.Options<P>,
|
||||||
|
): Effect.Effect<
|
||||||
|
Queue.Dequeue<Result<A, E, P>>,
|
||||||
|
never,
|
||||||
|
Scope.Scope | Exclude<R, Progress<any>>
|
||||||
|
> => Effect.Do.pipe(
|
||||||
|
Effect.bind("queue", () => Queue.unbounded<Result<A, E, P>>()),
|
||||||
|
Effect.bind("ref", () => Ref.make<Result<A, E, P>>(initial())),
|
||||||
|
Effect.tap(({ queue, ref }) => Effect.andThen(ref, v => Queue.offer(queue, v))),
|
||||||
|
Effect.tap(({ queue, ref }) => Effect.forkScoped(
|
||||||
|
Effect.addFinalizer(() => Queue.shutdown(queue)).pipe(
|
||||||
|
Effect.andThen(Effect.succeed(running(options?.initialProgress)).pipe(
|
||||||
|
Effect.tap(v => Ref.set(ref, v)),
|
||||||
|
Effect.tap(v => Queue.offer(queue, v)),
|
||||||
|
)),
|
||||||
Effect.andThen(effect),
|
Effect.andThen(effect),
|
||||||
Effect.exit,
|
Effect.exit,
|
||||||
Effect.andThen(exit => Queue.offer(queue, fromExit(exit))),
|
Effect.andThen(exit => Effect.succeed(fromExit(exit)).pipe(
|
||||||
|
Effect.tap(v => Ref.set(ref, v)),
|
||||||
|
Effect.tap(v => Queue.offer(queue, v)),
|
||||||
|
)),
|
||||||
Effect.scoped,
|
Effect.scoped,
|
||||||
))),
|
Effect.provide(makeProgressLayer(queue, ref)),
|
||||||
|
)
|
||||||
|
)),
|
||||||
|
Effect.map(({ queue }) => queue),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
const t = forkEffectScoped(
|
||||||
|
Effect.gen(function*() {
|
||||||
|
yield* Progress()
|
||||||
|
}),
|
||||||
|
{ initialProgress: "juif" }
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user