Skip to content
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
6 changes: 6 additions & 0 deletions packages/contract/src/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import type { AnySchema, InferSchemaOutput, Schema, SchemaIssue } from './schema
export interface ValidationErrorOptions extends ErrorOptions {
message: string
Comment thread
dinwwwh marked this conversation as resolved.
issues: readonly SchemaIssue[]
/**
* @todo require this field in v2
*/
data?: unknown
}

/**
Expand All @@ -14,11 +18,13 @@ export interface ValidationErrorOptions extends ErrorOptions {
*/
export class ValidationError extends Error {
readonly issues: readonly SchemaIssue[]
readonly data: unknown

constructor(options: ValidationErrorOptions) {
super(options.message, options)
Comment thread
dinwwwh marked this conversation as resolved.

this.issues = options.issues
this.data = options.data
}
}

Expand Down
1 change: 1 addition & 0 deletions packages/contract/src/event-iterator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe('eventIterator', async () => {
expect(e.code).toEqual('EVENT_ITERATOR_VALIDATION_FAILED')
expect(e.cause).toBeInstanceOf(ValidationError)
expect(e.cause.issues).toHaveLength(1)
expect(e.cause.data).toEqual({ order: '3' })

return true
})
Expand Down
1 change: 1 addition & 0 deletions packages/contract/src/event-iterator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export function eventIterator<TYieldIn, TYieldOut, TReturnIn = unknown, TReturnO
cause: new ValidationError({
issues: result.issues,
message: 'Event iterator validation failed',
data: value,
}),
Comment thread
dinwwwh marked this conversation as resolved.
})
Comment thread
dinwwwh marked this conversation as resolved.
}
Expand Down
12 changes: 10 additions & 2 deletions packages/server/src/procedure-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ async function validateInput(procedure: AnyProcedure, input: unknown): Promise<a
data: {
issues: result.issues,
},
cause: new ValidationError({ message: 'Input validation failed', issues: result.issues }),
cause: new ValidationError({
message: 'Input validation failed',
issues: result.issues,
data: input,
}),
Comment thread
dinwwwh marked this conversation as resolved.
})
Comment thread
dinwwwh marked this conversation as resolved.
}

Expand All @@ -206,7 +210,11 @@ async function validateOutput(procedure: AnyProcedure, output: unknown): Promise
if (result.issues) {
throw new ORPCError('INTERNAL_SERVER_ERROR', {
message: 'Output validation failed',
cause: new ValidationError({ message: 'Output validation failed', issues: result.issues }),
cause: new ValidationError({
message: 'Output validation failed',
issues: result.issues,
data: output,
}),
Comment thread
dinwwwh marked this conversation as resolved.
Comment thread
dinwwwh marked this conversation as resolved.
})
}

Expand Down
Loading