From a04169d2686ac10a26579f58c3a9ef5dcffcac1f Mon Sep 17 00:00:00 2001 From: Jesse Kelly Date: Mon, 30 Sep 2024 02:43:41 -0600 Subject: [PATCH] renamed to mergeWithTag --- .changeset/silver-tools-collect.md | 4 ++-- packages/effect/dtslint/Stream.ts | 2 +- packages/effect/src/Stream.ts | 6 +++--- packages/effect/src/internal/stream.ts | 2 +- packages/effect/test/Stream/merging.test.ts | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.changeset/silver-tools-collect.md b/.changeset/silver-tools-collect.md index 4464afd4e6..1ae691b926 100644 --- a/.changeset/silver-tools-collect.md +++ b/.changeset/silver-tools-collect.md @@ -2,7 +2,7 @@ "effect": patch --- -added Stream.mergeStruct +added Stream.mergeWithTag Combines a struct of streams into a single stream of tagged values where the tag is the key of the struct. @@ -10,7 +10,7 @@ Combines a struct of streams into a single stream of tagged values where the tag import { Stream } from "effect" // Stream.Stream<{ _tag: "a"; value: number; } | { _tag: "b"; value: string; }> -const stream = Stream.mergeStruct( +const stream = Stream.mergeWithTag( { a: Stream.make(0), b: Stream.make("") diff --git a/packages/effect/dtslint/Stream.ts b/packages/effect/dtslint/Stream.ts index 2d2c4534ef..6c793e9472 100644 --- a/packages/effect/dtslint/Stream.ts +++ b/packages/effect/dtslint/Stream.ts @@ -256,7 +256,7 @@ Stream.zipLatestAll(numbers, numbersOrStrings, Stream.fail(new Error(""))) // ------------------------------------------------------------------------------------- // $ExpectType Stream<{ _tag: "a"; value: number; } | { _tag: "b"; value: string; }, NoSuchElementException, never> -Stream.mergeStruct({ +Stream.mergeWithTag({ a: Stream.make(0).pipe(Stream.tap(() => new Cause.NoSuchElementException())), b: Stream.make("") }, { concurrency: 1 }) diff --git a/packages/effect/src/Stream.ts b/packages/effect/src/Stream.ts index 1a36b76b18..9b49ccdca8 100644 --- a/packages/effect/src/Stream.ts +++ b/packages/effect/src/Stream.ts @@ -2902,12 +2902,12 @@ export const mergeAll: { * * @example * // Stream.Stream<{ _tag: "a"; value: number; } | { _tag: "b"; value: string; }> - * const res = mergeStruct({ + * const res = mergeWithTag({ * a: Stream.make(0), * b: Stream.make("") * }) */ -export const mergeStruct: { +export const mergeWithTag: { }>( streams: S, options: { @@ -2927,7 +2927,7 @@ export const mergeStruct: { Stream.Error, Stream.Context > -} = internal.mergeStruct +} = internal.mergeWithTag /** * Merges this stream and the specified stream together to a common element diff --git a/packages/effect/src/internal/stream.ts b/packages/effect/src/internal/stream.ts index 60707538ed..c5abc3e098 100644 --- a/packages/effect/src/internal/stream.ts +++ b/packages/effect/src/internal/stream.ts @@ -4108,7 +4108,7 @@ export const mergeAll = dual< >((args) => Symbol.iterator in args[0], (streams, options) => flatten(fromIterable(streams), options)) /** @internal */ -export const mergeStruct: { +export const mergeWithTag: { }>( streams: S, options: { diff --git a/packages/effect/test/Stream/merging.test.ts b/packages/effect/test/Stream/merging.test.ts index a48b1cf7e4..1592b8111e 100644 --- a/packages/effect/test/Stream/merging.test.ts +++ b/packages/effect/test/Stream/merging.test.ts @@ -38,9 +38,9 @@ describe("Stream", () => { assert.deepStrictEqual(Array.from(result), [1]) })) - it.effect("mergeStruct", (ctx) => + it.effect("mergeWithTag", (ctx) => Effect.gen(function*() { - const stream = Stream.mergeStruct({ + const stream = Stream.mergeWithTag({ a: Stream.make(0), b: Stream.make("") }, { concurrency: 1 })