Skip to content

Commit

Permalink
chore: apply lint and formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
autofix-ci[bot] committed Feb 8, 2024
1 parent 5a65ceb commit cb7f762
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 38 deletions.
19 changes: 12 additions & 7 deletions packages/client/src/TRPCClientError.ts
Expand Up @@ -11,15 +11,17 @@ import {
type DefaultErrorShape,
} from '@trpc/server/unstable-core-do-not-import';

type inferErrorShape<TInferrable extends InferrableClientTypes<AnyClientTypesWithoutCtx>> =
inferClientTypes<TInferrable, AnyClientTypesWithoutCtx>['errorShape'];
type inferErrorShape<
TInferrable extends InferrableClientTypes<AnyClientTypesWithoutCtx>,
> = inferClientTypes<TInferrable, AnyClientTypesWithoutCtx>['errorShape'];
export interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {
readonly message: string;
readonly shape: Maybe<TShape>;
readonly data: Maybe<TShape['data']>;
}
export type TRPCClientErrorLike<TInferrable extends InferrableClientTypes<AnyClientTypesWithoutCtx>> =
TRPCClientErrorBase<inferErrorShape<TInferrable>>;
export type TRPCClientErrorLike<
TInferrable extends InferrableClientTypes<AnyClientTypesWithoutCtx>,
> = TRPCClientErrorBase<inferErrorShape<TInferrable>>;

function isTRPCClientError(cause: unknown): cause is TRPCClientError<any> {
return (
Expand All @@ -41,7 +43,9 @@ function isTRPCErrorResponse(obj: unknown): obj is TRPCErrorResponse<any> {
);
}

export class TRPCClientError<TRouterOrProcedure extends AnyClientTypesWithoutCtx>
export class TRPCClientError<
TRouterOrProcedure extends AnyClientTypesWithoutCtx,
>
extends Error
implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>
{
Expand Down Expand Up @@ -81,13 +85,14 @@ export class TRPCClientError<TRouterOrProcedure extends AnyClientTypesWithoutCtx
Object.setPrototypeOf(this, TRPCClientError.prototype);
}

public static from<TRouterOrProcedure extends InferrableClientTypes<AnyClientTypesWithoutCtx>>(
public static from<
TRouterOrProcedure extends InferrableClientTypes<AnyClientTypesWithoutCtx>,
>(
_cause: Error | TRPCErrorResponse<any>,
opts: { meta?: Record<string, unknown> } = {},
): TRPCClientError<TRouterOrProcedure> {
const cause = _cause as unknown;


if (isTRPCClientError(cause)) {
if (opts.meta) {
// Decorate with meta error data
Expand Down
13 changes: 7 additions & 6 deletions packages/client/src/internals/TRPCUntypedClient.ts
Expand Up @@ -36,11 +36,12 @@ export interface TRPCSubscriptionObserver<TValue, TError> {
}

/** @internal */
export type CreateTRPCClientOptions<TInferrable extends InferrableClientTypes> = {
links: TRPCLink<TInferrable>[];
createContext?: () => Promise<inferClientTypes<TInferrable>['ctx']>;
transformer?: TypeError<'The transformer property has moved to httpLink/httpBatchLink/wsLink'>;
};
export type CreateTRPCClientOptions<TInferrable extends InferrableClientTypes> =
{
links: TRPCLink<TInferrable>[];
createContext?: () => Promise<inferClientTypes<TInferrable>['ctx']>;
transformer?: TypeError<'The transformer property has moved to httpLink/httpBatchLink/wsLink'>;
};

/** @internal */
export type UntypedClientProperties =
Expand All @@ -61,7 +62,7 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
constructor(opts: CreateTRPCClientOptions<TRouter>) {
this.requestId = 0;

this.runtime = {createContext: opts.createContext};
this.runtime = { createContext: opts.createContext };

// Initialize the links
this.links = opts.links.map((link) => link(this.runtime));
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/links/types.ts
@@ -1,9 +1,9 @@
import type { Observable, Observer } from '@trpc/server/observable';
import type {
inferClientTypes,
InferrableClientTypes,
TRPCResultMessage,
TRPCSuccessResponse,
inferClientTypes,
} from '@trpc/server/unstable-core-do-not-import';
import type { ResponseEsque } from '../internals/types';
import type { TRPCClientError } from '../TRPCClientError';
Expand Down Expand Up @@ -58,7 +58,7 @@ export type TRPCFetch = (
) => Promise<ResponseEsque>;

export interface TRPCClientRuntime<TInferrable extends InferrableClientTypes> {
createContext?: () => Promise<inferClientTypes<TInferrable>['ctx']>
createContext?: () => Promise<inferClientTypes<TInferrable>['ctx']>;
}

/**
Expand Down
10 changes: 6 additions & 4 deletions packages/next/src/app-dir/links/nextCache.ts
Expand Up @@ -32,9 +32,11 @@ export function experimental_nextCacheLink<TRouter extends AnyRouter>(
opts: NextCacheLinkOptions<TRouter>,
): TRPCLink<TRouter> {
const transformer = getTransformer(opts.transformer);
return ({createContext}) =>{
if (!createContext)
throw new Error('\`createContext\` is required to be passed to use \`experimental_nextCacheLink\`.')
return ({ createContext }) => {
if (!createContext)
throw new Error(
'`createContext` is required to be passed to use `experimental_nextCacheLink`.',
);

return ({ op }) =>
observable((observer) => {
Expand Down Expand Up @@ -95,5 +97,5 @@ export function experimental_nextCacheLink<TRouter extends AnyRouter>(
observer.error(TRPCClientError.from(cause));
});
});
}
};
}
1 change: 0 additions & 1 deletion packages/next/src/app-dir/server.ts
Expand Up @@ -51,7 +51,6 @@ export function experimental_createTRPCNextAppDirServer<
const procedurePath = pathCopy.join('.');
const procedureType = clientCallTypeToProcedureType(action);


const cacheTag = await generateCacheTag(
procedurePath,
callOpts.args[0],
Expand Down
8 changes: 6 additions & 2 deletions packages/next/src/ssrPrepass.ts
Expand Up @@ -20,7 +20,11 @@ import type {
NextPageContext,
} from 'next/dist/shared/lib/utils';
import { createElement } from 'react';
import type { TRPCPrepassHelper, TRPCPrepassProps, WithTRPCSSROptions } from './withTRPC';
import type {
TRPCPrepassHelper,
TRPCPrepassProps,
WithTRPCSSROptions,
} from './withTRPC';

function transformQueryOrMutationCacheErrors<
TState extends
Expand Down Expand Up @@ -51,7 +55,7 @@ export const ssrPrepass: TRPCPrepassHelper = <TRouter extends AnyRouter>(opts: {
AppOrPage: NextComponentType<any, any, any>;
}) => {
const { parent, WithTRPC, AppOrPage } = opts;
type $PrepassProps= TRPCPrepassProps<TRouter, any>;
type $PrepassProps = TRPCPrepassProps<TRouter, any>;

const transformer = getTransformer(
(parent as CoercedTransformerParameters).transformer,
Expand Down
@@ -1,12 +1,20 @@
import type { AnyRootTypes } from '../rootConfig';

export type AnyClientTypes = Pick<AnyRootTypes, 'errorShape' | 'transformer' | 'ctx'>;
export type AnyClientTypesWithoutCtx = Pick<AnyRootTypes, 'errorShape' | 'transformer'>
export type AnyClientTypes = Pick<
AnyRootTypes,
'errorShape' | 'transformer' | 'ctx'
>;
export type AnyClientTypesWithoutCtx = Pick<
AnyRootTypes,
'errorShape' | 'transformer'
>;

/**
* Result of `initTRPC.create()`
*/
type InitLike<TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes> = {
type InitLike<
TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes,
> = {
_config: {
$types: TAnyClientTypes;
};
Expand All @@ -15,21 +23,27 @@ type InitLike<TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes
/**
* Result of `initTRPC.create().router()`
*/
type RouterLike<TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes> = {
type RouterLike<
TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes,
> = {
_def: InitLike<TAnyClientTypes>;
};

/**
* Result of `initTRPC.create()._config`
*/
type RootConfigLike<TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes> = {
type RootConfigLike<
TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes,
> = {
$types: TAnyClientTypes;
};

/**
* Anything that can be inferred to the root config types needed for a TRPC client
*/
export type InferrableClientTypes<TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes > =
export type InferrableClientTypes<
TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes,
> =
| RouterLike<TAnyClientTypes>
| InitLike<TAnyClientTypes>
| RootConfigLike<TAnyClientTypes>
Expand All @@ -38,13 +52,15 @@ export type InferrableClientTypes<TAnyClientTypes extends AnyClientTypesWithoutC
/**
* Infer the root types from a InferrableClientTypes
*/
export type inferClientTypes<TInferrable extends InferrableClientTypes<TAnyClientTypes>, TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes> =
TInferrable extends TAnyClientTypes
? TInferrable
: TInferrable extends RootConfigLike<TAnyClientTypes>
? TInferrable['$types']
: TInferrable extends InitLike<TAnyClientTypes>
? TInferrable['_config']['$types']
: TInferrable extends RouterLike<TAnyClientTypes>
? TInferrable['_def']['_config']['$types']
: never;
export type inferClientTypes<
TInferrable extends InferrableClientTypes<TAnyClientTypes>,
TAnyClientTypes extends AnyClientTypesWithoutCtx = AnyClientTypes,
> = TInferrable extends TAnyClientTypes
? TInferrable
: TInferrable extends RootConfigLike<TAnyClientTypes>
? TInferrable['$types']
: TInferrable extends InitLike<TAnyClientTypes>
? TInferrable['_config']['$types']
: TInferrable extends RouterLike<TAnyClientTypes>
? TInferrable['_def']['_config']['$types']
: never;

0 comments on commit cb7f762

Please sign in to comment.