From c81fd15d79063aa2404c9a8fb2c5e8750ddc7b3e Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 8 May 2024 09:05:30 +1200 Subject: [PATCH] rename --- .changeset/witty-buckets-kiss.md | 2 +- packages/rx/src/Rx.ts | 24 ++++++++++++------------ packages/rx/test/Rx.test.ts | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.changeset/witty-buckets-kiss.md b/.changeset/witty-buckets-kiss.md index d859821..6a056b3 100644 --- a/.changeset/witty-buckets-kiss.md +++ b/.changeset/witty-buckets-kiss.md @@ -2,4 +2,4 @@ "@effect-rx/rx": patch --- -added Rx.sub for working with Subscribables +added Rx.subscribable for working with Subscribables diff --git a/packages/rx/src/Rx.ts b/packages/rx/src/Rx.ts index 0e3809b..8482e8c 100644 --- a/packages/rx/src/Rx.ts +++ b/packages/rx/src/Rx.ts @@ -300,7 +300,7 @@ const RxRuntimeProto = { return makeStreamPull(pullRx as any, options) }, - subRef(this: RxRuntime, arg: any) { + subscriptionRef(this: RxRuntime, arg: any) { return makeSubRef(readable((get) => { const previous = get.self>() const runtimeResult = get(this) @@ -316,8 +316,8 @@ const RxRuntimeProto = { })) }, - sub(this: RxRuntime, arg: any) { - return makeSub(readable((get) => { + subscribable(this: RxRuntime, arg: any) { + return makeSubscribable(readable((get) => { const previous = get.self>() const runtimeResult = get(this) if (runtimeResult._tag !== "Success") { @@ -564,13 +564,13 @@ export interface RxRuntime extends Rx, E readonly initialValue?: ReadonlyArray }) => Writable, void> - readonly subRef: ( + readonly subscriptionRef: ( create: | Effect.Effect, E, R> | Rx.Read, E, R>> ) => Writable, A> - readonly sub: ( + readonly subscribable: ( create: | Effect.Effect, E1, R> | Rx.Read, E1, R>> @@ -679,7 +679,7 @@ function makeStream( // ----------------------------------------------------------------------------- /** @internal */ -const readSub = +const readSubscribable = (subRx: Rx | Result.Result, any>>) => (get: Context) => { const sub = get(subRx) @@ -709,14 +709,14 @@ const makeSubRef = ( } } - return writable(readSub(refRx), write) + return writable(readSubscribable(refRx), write) } /** * @since 1.0.0 * @category constructors */ -export const subRef: { +export const subscriptionRef: { (ref: SubscriptionRef.SubscriptionRef | Rx.Read>): Writable ( effect: @@ -749,15 +749,15 @@ export const subRef: { * @since 1.0.0 * @category constructors */ -export const makeSub = ( +export const makeSubscribable = ( subRx: Rx | Result.Result, any>> -) => readable(readSub(subRx)) +) => readable(readSubscribable(subRx)) /** * @since 1.0.0 * @category constructors */ -export const sub: { +export const subscribable: { (ref: Subscribable.Subscribable | Rx.Read>): Rx ( effect: @@ -771,7 +771,7 @@ export const sub: { | Effect.Effect, any, never> | Rx.Read, any, never>> ) => - makeSub(readable((get) => { + makeSubscribable(readable((get) => { let value: Subscribable.Subscribable | Effect.Effect, any, any> if (typeof ref === "function") { value = ref(get) diff --git a/packages/rx/test/Rx.test.ts b/packages/rx/test/Rx.test.ts index db973c4..a9d3ca5 100644 --- a/packages/rx/test/Rx.test.ts +++ b/packages/rx/test/Rx.test.ts @@ -778,7 +778,7 @@ describe("Rx", () => { it("Subscribable", async () => { vitest.useRealTimers() const sub = Subscribable.make({ get: Effect.succeed(123), changes: Stream.empty }) - const rx = Rx.sub(sub) + const rx = Rx.subscribable(sub) const r = Registry.make() const unmount = r.mount(rx) assert.deepStrictEqual(r.get(rx), 123) @@ -788,7 +788,7 @@ describe("Rx", () => { it("Subscribable/SubscriptionRef", async () => { vitest.useRealTimers() const ref = SubscriptionRef.make(123).pipe(Effect.runSync) - const rx = Rx.sub(ref) + const rx = Rx.subscribable(ref) const r = Registry.make() assert.deepStrictEqual(r.get(rx), 123) await Effect.runPromise(SubscriptionRef.update(ref, (a) => a + 1)) @@ -798,7 +798,7 @@ describe("Rx", () => { it("SubscriptionRef", async () => { vitest.useRealTimers() const ref = SubscriptionRef.make(0).pipe(Effect.runSync) - const rx = Rx.subRef(ref) + const rx = Rx.subscriptionRef(ref) const r = Registry.make() const unmount = r.mount(rx) assert.deepStrictEqual(r.get(rx), 0) @@ -809,7 +809,7 @@ describe("Rx", () => { }) it("SubscriptionRef/effect", async () => { - const rx = Rx.subRef(SubscriptionRef.make(0)) + const rx = Rx.subscriptionRef(SubscriptionRef.make(0)) const r = Registry.make() const unmount = r.mount(rx) assert.deepStrictEqual(r.get(rx), Result.success(0, true)) @@ -820,7 +820,7 @@ describe("Rx", () => { }) it("SubscriptionRef/runtime", async () => { - const rx = counterRuntime.subRef(SubscriptionRef.make(0)) + const rx = counterRuntime.subscriptionRef(SubscriptionRef.make(0)) const r = Registry.make() const unmount = r.mount(rx) assert.deepStrictEqual(r.get(rx), Result.success(0, true))