Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add onYield hook #16

Merged
merged 1 commit into from
Mar 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { QuansyncAwaitableGenerator, QuansyncFn, QuansyncGenerator, QuansyncGeneratorFn, QuansyncInput, QuansyncInputObject } from './types'
import type { QuansyncAwaitableGenerator, QuansyncFn, QuansyncGenerator, QuansyncGeneratorFn, QuansyncInput, QuansyncInputObject, QuansyncOptions } from './types'

export * from './types'

Expand Down Expand Up @@ -59,11 +59,16 @@ function unwrapYield(value: any, isAsync?: boolean): any {
return value
}

function iterateSync<Return>(generator: QuansyncGenerator<Return, unknown>): Return {
const DEFAULT_ON_YIELD = (value: any): any => value

function iterateSync<Return>(
generator: QuansyncGenerator<Return, unknown>,
onYield: QuansyncOptions['onYield'] = DEFAULT_ON_YIELD,
): Return {
let current = generator.next()
while (!current.done) {
try {
current = generator.next(unwrapYield(current.value))
current = generator.next(unwrapYield(onYield(current.value, false)))
}
catch (err) {
current = generator.throw(err)
Expand All @@ -72,11 +77,14 @@ function iterateSync<Return>(generator: QuansyncGenerator<Return, unknown>): Ret
return unwrapYield(current.value)
}

async function iterateAsync<Return>(generator: QuansyncGenerator<Return, unknown>): Promise<Return> {
async function iterateAsync<Return>(
generator: QuansyncGenerator<Return, unknown>,
onYield: QuansyncOptions['onYield'] = DEFAULT_ON_YIELD,
): Promise<Return> {
let current = generator.next()
while (!current.done) {
try {
current = generator.next(await unwrapYield(current.value, true))
current = generator.next(await unwrapYield(onYield(current.value, true), true))
}
catch (err) {
current = generator.throw(err)
Expand All @@ -87,14 +95,15 @@ async function iterateAsync<Return>(generator: QuansyncGenerator<Return, unknown

function fromGeneratorFn<Return, Args extends any[]>(
generatorFn: QuansyncGeneratorFn<Return, Args>,
options?: QuansyncOptions,
): QuansyncFn<Return, Args> {
return fromObject({
name: generatorFn.name,
async(...args) {
return iterateAsync(generatorFn.apply(this, args))
return iterateAsync(generatorFn.apply(this, args), options?.onYield)
},
sync(...args) {
return iterateSync(generatorFn.apply(this, args))
return iterateSync(generatorFn.apply(this, args), options?.onYield)
},
})
}
Expand All @@ -103,14 +112,22 @@ function fromGeneratorFn<Return, Args extends any[]>(
* Creates a new Quansync function, a "superposition" between async and sync.
*/
export function quansync<Return, Args extends any[] = []>(
options: QuansyncInput<Return, Args> | Promise<Return>,
input: QuansyncInputObject<Return, Args>,
): QuansyncFn<Return, Args>
export function quansync<Return, Args extends any[] = []>(
input: QuansyncGeneratorFn<Return, Args> | Promise<Return>,
options?: QuansyncOptions,
): QuansyncFn<Return, Args>
export function quansync<Return, Args extends any[] = []>(
input: QuansyncInput<Return, Args> | Promise<Return>,
options?: QuansyncOptions,
): QuansyncFn<Return, Args> {
if (isThenable(options))
return fromPromise<Return>(options)
if (typeof options === 'function')
return fromGeneratorFn(options)
if (isThenable(input))
return fromPromise<Return>(input)
if (typeof input === 'function')
return fromGeneratorFn(input, options)
else
return fromObject(options)
return fromObject(input)
}

/**
Expand Down
6 changes: 5 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
export interface QuansyncInputObject<Return, Args extends any[]> {
export interface QuansyncOptions {
onYield?: (value: any, isAsync: boolean) => any
}

export interface QuansyncInputObject<Return, Args extends any[]> extends QuansyncOptions {
name?: string
sync: (...args: Args) => Return
async: (...args: Args) => Promise<Return>
Expand Down
28 changes: 27 additions & 1 deletion test/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, it } from 'vitest'
import { expect, it, vi } from 'vitest'
import { quansync, toGenerator } from '../src'
import { quansync as quansyncMacro } from '../src/macro'

Expand Down Expand Up @@ -256,3 +256,29 @@ it('bind this', async () => {
await expect(cls.async()).resolves.instanceOf(Cls)
expect(cls.sync()).instanceOf(Cls)
})

it('call onYield hook', async () => {
const onYield = vi.fn(v => v + 1)
const run = quansync(function* () {
expect(yield 1).toBe(2)
expect(yield 2).toBe(3)
}, { onYield })

await run.async()
expect(onYield).toBeCalledTimes(2)
run.sync()
expect(onYield).toBeCalledTimes(4)

// custom error on promise
const run2 = quansync(function* () {
return yield Promise.resolve('foo')
}, {
onYield: (v, isAsync) => {
if (!isAsync && v instanceof Promise)
throw new TypeError('custom error')
return v
},
})
expect(() => run2.sync()).toThrowErrorMatchingInlineSnapshot(`[TypeError: custom error]`)
await expect(run2.async()).resolves.toMatchInlineSnapshot(`"foo"`)
})