Skip to content

feat(server): support chaining after .callable and .actionable #223

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.

Sign up for GitHub

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

Merged
dinwwwh merged 2 commits into from
Mar 11, 2025
Merged

feat(server): support chaining after .callable and .actionable #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c76543d
feat(server): support chaining after .callable and .actionable
dinwwwh Mar 11, 2025
93d87aa
sync: ImplementedProcedure
dinwwwh Mar 11, 2025
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
4 changes: 2 additions & 2 deletions packages/server/src/implementer-procedure.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ describe('ImplementedProcedure', () => {
})

expectTypeOf(applied).toEqualTypeOf<
Procedure<
ImplementedProcedure<
InitialContext,
CurrentContext,
typeof inputSchema,
Expand All @@ -164,7 +164,7 @@ describe('ImplementedProcedure', () => {
})

expectTypeOf(applied).toEqualTypeOf<
Procedure<
ImplementedProcedure<
InitialContext,
CurrentContext,
typeof inputSchema,
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/implementer-procedure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export interface ImplementedProcedure<
TClientContext
>
>
): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
): ImplementedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
& ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap >

/**
Expand All @@ -90,7 +90,7 @@ export interface ImplementedProcedure<
TClientContext
>
>
): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
): ImplementedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
& ((...rest: ClientRest<TClientContext, InferSchemaInput<TInputSchema>>) => Promise<InferSchemaOutput<TOutputSchema>>)
}

Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/procedure-decorated.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ describe('DecoratedProcedure', () => {
})

expectTypeOf(applied).toEqualTypeOf<
Procedure<
DecoratedProcedure<
InitialContext,
CurrentContext,
typeof inputSchema,
Expand All @@ -192,7 +192,7 @@ describe('DecoratedProcedure', () => {
})

expectTypeOf(applied).toEqualTypeOf<
Procedure<
DecoratedProcedure<
InitialContext,
CurrentContext,
typeof inputSchema,
Expand Down
29 changes: 26 additions & 3 deletions packages/server/src/procedure-decorated.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,42 @@ describe('decoratedProcedure', () => {

expect(createProcedureClient).toBeCalledTimes(1)
expect(createProcedureClient).toBeCalledWith(decorated, options)
expect(applied).not.haveOwnPropertyDescriptor('use')

// can access to function properties
expect('name' in applied).toBe(true)
expect(typeof applied.name).toBe('string')
expect('length' in applied).toBe(true)
expect(typeof applied.length).toBe('number')

expect('use' in applied).toBe(true)
expect('route' in applied).toBe(true)
expect('meta' in applied).toBe(true)

expect(applied.route({})).toBeInstanceOf(DecoratedProcedure)
expect(applied.route({})).toEqual(decorated)
})

it('.actionable', () => {
const options = { context: { db: 'postgres' } }

const applied = decorated.actionable(options)

expect(applied).toBeInstanceOf(Function)
expect(applied).toSatisfy(isProcedure)

expect(createProcedureClient).toBeCalledTimes(1)
expect(createProcedureClient).toBeCalledWith(decorated, options)
expect(applied).not.haveOwnPropertyDescriptor('use')

// can access to function properties
expect('name' in applied).toBe(true)
expect(typeof applied.name).toBe('string')
expect('length' in applied).toBe(true)
expect(typeof applied.length).toBe('number')

expect('use' in applied).toBe(true)
expect('route' in applied).toBe(true)
expect('meta' in applied).toBe(true)

expect(applied.route({})).toBeInstanceOf(DecoratedProcedure)
expect(applied.route({})).toEqual(decorated)
})
})
16 changes: 10 additions & 6 deletions packages/server/src/procedure-decorated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,16 @@ export class DecoratedProcedure<
TClientContext
>
>
): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
& ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap> {
return Object.assign(createProcedureClient(this, ...rest as any), {
'~type': 'Procedure' as const,
'~orpc': this['~orpc'],
})
return new Proxy(createProcedureClient(this, ...rest as any), {
get: (target, key) => {
return Reflect.has(this, key) ? Reflect.get(this, key) : Reflect.get(target, key)
},
has: (target, key) => {
return Reflect.has(this, key) || Reflect.has(target, key)
},
}) as any
}

/**
Expand All @@ -140,7 +144,7 @@ export class DecoratedProcedure<
>
>
):
& Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
& DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>
& ((...rest: ClientRest<TClientContext, InferSchemaInput<TInputSchema>>) => Promise<InferSchemaOutput<TOutputSchema>>) {
return this.callable(...rest)
}
Expand Down