fix: accept source as a sink input type

To make it a bit more flexible
alanshaw · Apr 19, 2023 · e6a1a42 · e6a1a42
1 parent e1b5942
commit e6a1a42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -153,6 +153,7 @@
  ]
  },
  "scripts": {
+ "clean": "aegir clean",
  "lint": "aegir lint",
  "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
  "build": "tsc",

diff --git a/src/index.ts b/src/index.ts
@@ -139,11 +139,11 @@ export function abortableSource <T> (source: Source<T>, signal: AbortSignal, opt
  return abortable()
 }
 
-export function abortableSink <T, R = Promise<void>> (sink: Sink<AsyncIterable<T>, R>, signal: AbortSignal, options?: Options<T>): Sink<AsyncIterable<T>, R> {
+export function abortableSink <T, R = Promise<void>> (sink: Sink<AsyncIterable<T>, R>, signal: AbortSignal, options?: Options<T>): Sink<Source<T>, R> {
  return (source: Source<T>) => sink(abortableSource(source, signal, options))
 }
 
-export function abortableDuplex <TSource, TSink = TSource, RSink = Promise<void>> (duplex: Duplex<AsyncIterable<TSource>, AsyncIterable<TSink>, RSink>, signal: AbortSignal, options?: Options<TSource>): Duplex<AsyncGenerator<TSource>, AsyncIterable<TSink>, RSink> {
+export function abortableDuplex <TSource, TSink = TSource, RSink = Promise<void>> (duplex: Duplex<AsyncIterable<TSource>, Source<TSink>, RSink>, signal: AbortSignal, options?: Options<TSource>): Duplex<AsyncGenerator<TSource>, Source<TSink>, RSink> {
  return {
  sink: abortableSink(duplex.sink, signal, {
  ...options,

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -175,7 +175,7 @@ describe('abortable-iterator', () => {
 
  it('should abort a duplex used as a source', async () => {
  const controller = new AbortController()
- const duplex: Duplex<AsyncIterable<number>> = {
+ const duplex: Duplex<AsyncIterable<number>, Source<number>> = {
  source: forever(),
  sink: async (source) => { await drain(source) }
  }
@@ -192,7 +192,7 @@ describe('abortable-iterator', () => {
 
  it('should abort a duplex used as a transform', async () => {
  const controller = new AbortController()
- const duplex: Duplex<AsyncIterable<number>> = {
+ const duplex: Duplex<AsyncIterable<number>, Source<number>> = {
  source: forever(),
  sink: drain
  }
@@ -210,7 +210,7 @@ describe('abortable-iterator', () => {
 
  it('should abort a duplex used as a sink', async () => {
  const controller = new AbortController()
- const duplex: Duplex<AsyncIterable<number>> = {
+ const duplex: Duplex<AsyncIterable<number>, Source<number>> = {
  source: forever(),
  sink: drain
  }