@geekmidas/constructs 3.0.11 → 3.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/dist/{Construct-B14miJ6P.cjs → Construct-DXfLPGwg.cjs} +5 -42
- package/dist/{Construct-B14miJ6P.cjs.map → Construct-DXfLPGwg.cjs.map} +1 -1
- package/dist/{HonoEndpointAdaptor-DhphPq5r.cjs → HonoEndpointAdaptor-DFdgCwYU.cjs} +16 -16
- package/dist/{HonoEndpointAdaptor-DhphPq5r.cjs.map → HonoEndpointAdaptor-DFdgCwYU.cjs.map} +1 -1
- package/dist/adaptors/aws.cjs +13 -12
- package/dist/adaptors/aws.cjs.map +1 -1
- package/dist/adaptors/hono.cjs +5 -5
- package/dist/adaptors/testing.cjs +12 -11
- package/dist/adaptors/testing.cjs.map +1 -1
- package/dist/adaptors/trpc.cjs +65 -0
- package/dist/adaptors/trpc.cjs.map +1 -0
- package/dist/adaptors/trpc.d.cts +85 -0
- package/dist/adaptors/trpc.d.cts.map +1 -0
- package/dist/adaptors/trpc.d.mts +85 -0
- package/dist/adaptors/trpc.d.mts.map +1 -0
- package/dist/adaptors/trpc.mjs +63 -0
- package/dist/adaptors/trpc.mjs.map +1 -0
- package/dist/chunk-DWy1uDak.cjs +39 -0
- package/dist/crons/index.cjs +5 -4
- package/dist/crons/index.cjs.map +1 -1
- package/dist/endpoints/index.cjs +7 -6
- package/dist/endpoints/index.cjs.map +1 -1
- package/dist/functions/index.cjs +2 -2
- package/dist/{functions-DiaRAdfp.cjs → functions-CX21wstW.cjs} +11 -10
- package/dist/{functions-DiaRAdfp.cjs.map → functions-CX21wstW.cjs.map} +1 -1
- package/dist/index.cjs +1 -1
- package/dist/{lazyAccessors-Bc1u42WC.cjs → lazyAccessors-zNy6P6Cg.cjs} +11 -10
- package/dist/{lazyAccessors-Bc1u42WC.cjs.map → lazyAccessors-zNy6P6Cg.cjs.map} +1 -1
- package/dist/{processAudits-CUko08pi.cjs → processAudits-B_a9bDPs.cjs} +3 -3
- package/dist/{processAudits-CUko08pi.cjs.map → processAudits-B_a9bDPs.cjs.map} +1 -1
- package/dist/subscribers/index.cjs +3 -2
- package/dist/subscribers/index.cjs.map +1 -1
- package/package.json +109 -49
- package/src/adaptors/__tests__/trpc.spec.ts +213 -0
- package/src/adaptors/trpc.ts +192 -0
- package/tsdown.config.ts +1 -0
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import type { EnvironmentParser } from '@geekmidas/envkit';
|
|
2
|
+
import type { Logger } from '@geekmidas/logger';
|
|
3
|
+
import {
|
|
4
|
+
runWithRequestContext,
|
|
5
|
+
type Service,
|
|
6
|
+
ServiceDiscovery,
|
|
7
|
+
type ServiceRecord,
|
|
8
|
+
} from '@geekmidas/services';
|
|
9
|
+
import type {
|
|
10
|
+
TRPCMiddlewareBuilder,
|
|
11
|
+
TRPCMiddlewareFunction,
|
|
12
|
+
} from '@trpc/server';
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Shape of `t.middleware` from `@trpc/server`. We accept this rather than the
|
|
16
|
+
* initialized `t` object so callers retain ownership of their tRPC instance
|
|
17
|
+
* (no double-initialization, no opinion on context/meta shape).
|
|
18
|
+
*/
|
|
19
|
+
type CreateMiddleware<TContext, TMeta> = <$ContextOverrides>(
|
|
20
|
+
fn: TRPCMiddlewareFunction<
|
|
21
|
+
TContext,
|
|
22
|
+
TMeta,
|
|
23
|
+
object,
|
|
24
|
+
$ContextOverrides,
|
|
25
|
+
unknown
|
|
26
|
+
>,
|
|
27
|
+
) => TRPCMiddlewareBuilder<TContext, TMeta, $ContextOverrides, unknown>;
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Result of `createServicesMiddleware`: a function that accepts a service
|
|
31
|
+
* tuple and returns a tRPC middleware that merges resolved services onto the
|
|
32
|
+
* context.
|
|
33
|
+
*/
|
|
34
|
+
export type ServicesMiddleware<
|
|
35
|
+
TContext extends object,
|
|
36
|
+
TMeta extends object,
|
|
37
|
+
> = <const T extends Service[]>(
|
|
38
|
+
services: [...T],
|
|
39
|
+
) => TRPCMiddlewareBuilder<TContext, TMeta, ServiceRecord<T>, unknown>;
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* Context shape required by `createServicesMiddleware` overload 2.
|
|
43
|
+
* Procedures that pull services via context-stored discovery must expose it
|
|
44
|
+
* under `serviceDiscovery`.
|
|
45
|
+
*/
|
|
46
|
+
export interface ContextWithServiceDiscovery {
|
|
47
|
+
serviceDiscovery: ServiceDiscovery;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Minimum context required for request-context propagation. `logger` must be
|
|
52
|
+
* present so services can call `serviceContext.getLogger()`. `requestId` and
|
|
53
|
+
* `startTime` are auto-generated if missing.
|
|
54
|
+
*/
|
|
55
|
+
export interface ContextWithLogger {
|
|
56
|
+
logger: Logger;
|
|
57
|
+
requestId?: string;
|
|
58
|
+
startTime?: number;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Create a tRPC middleware that:
|
|
63
|
+
*
|
|
64
|
+
* 1. Resolves the requested services via `ServiceDiscovery`.
|
|
65
|
+
* 2. Wraps the downstream call in `runWithRequestContext` so any code reached
|
|
66
|
+
* by the procedure (including service method implementations) can read the
|
|
67
|
+
* current logger/request id via `serviceContext`.
|
|
68
|
+
* 3. Merges the resolved services onto the tRPC context so handlers can access
|
|
69
|
+
* them by service name (`ctx.database`, `ctx.cache`, ...).
|
|
70
|
+
*
|
|
71
|
+
* Two overloads:
|
|
72
|
+
* - Pass an `envParser` to create a per-request `ServiceDiscovery` instance.
|
|
73
|
+
* - Omit `envParser` to read `ctx.serviceDiscovery` from the tRPC context.
|
|
74
|
+
*
|
|
75
|
+
* @example
|
|
76
|
+
* ```ts
|
|
77
|
+
* import { initTRPC } from '@trpc/server';
|
|
78
|
+
* import { createServicesMiddleware } from '@geekmidas/constructs/trpc';
|
|
79
|
+
*
|
|
80
|
+
* const t = initTRPC.context<Context>().create();
|
|
81
|
+
* const withServices = createServicesMiddleware(t.middleware, envParser);
|
|
82
|
+
*
|
|
83
|
+
* export const authedProcedure = t.procedure.use(
|
|
84
|
+
* withServices([databaseService, cacheService]),
|
|
85
|
+
* );
|
|
86
|
+
* ```
|
|
87
|
+
*/
|
|
88
|
+
export function createServicesMiddleware<
|
|
89
|
+
TContext extends ContextWithLogger & object,
|
|
90
|
+
TMeta extends object,
|
|
91
|
+
>(
|
|
92
|
+
mw: CreateMiddleware<TContext, TMeta>,
|
|
93
|
+
envParser: EnvironmentParser<{}>,
|
|
94
|
+
): ServicesMiddleware<TContext, TMeta>;
|
|
95
|
+
export function createServicesMiddleware<
|
|
96
|
+
TContext extends ContextWithLogger & ContextWithServiceDiscovery & object,
|
|
97
|
+
TMeta extends object,
|
|
98
|
+
>(mw: CreateMiddleware<TContext, TMeta>): ServicesMiddleware<TContext, TMeta>;
|
|
99
|
+
export function createServicesMiddleware<
|
|
100
|
+
TContext extends ContextWithLogger & object,
|
|
101
|
+
TMeta extends object,
|
|
102
|
+
>(
|
|
103
|
+
mw: CreateMiddleware<TContext, TMeta>,
|
|
104
|
+
envParser?: EnvironmentParser<{}>,
|
|
105
|
+
): ServicesMiddleware<TContext, TMeta> {
|
|
106
|
+
return (<const T extends Service[]>(services: [...T]) => {
|
|
107
|
+
const builder = mw(async (opts) => {
|
|
108
|
+
const ctx = opts.ctx as TContext & Partial<ContextWithServiceDiscovery>;
|
|
109
|
+
|
|
110
|
+
const discovery =
|
|
111
|
+
ctx.serviceDiscovery ??
|
|
112
|
+
ServiceDiscovery.getInstance(
|
|
113
|
+
envParser ??
|
|
114
|
+
(() => {
|
|
115
|
+
// Hit only if overload 2 was selected but ctx.serviceDiscovery is
|
|
116
|
+
// missing at runtime — surface the mistake immediately rather
|
|
117
|
+
// than letting an undefined env parser fail deep inside register.
|
|
118
|
+
throw new Error(
|
|
119
|
+
'createServicesMiddleware: no `envParser` provided and ' +
|
|
120
|
+
'`ctx.serviceDiscovery` is missing. Pass an EnvironmentParser ' +
|
|
121
|
+
'to createServicesMiddleware(), or attach a ServiceDiscovery ' +
|
|
122
|
+
'instance to the tRPC context.',
|
|
123
|
+
);
|
|
124
|
+
})(),
|
|
125
|
+
);
|
|
126
|
+
|
|
127
|
+
const requestId = ctx.requestId ?? crypto.randomUUID();
|
|
128
|
+
const startTime = ctx.startTime ?? Date.now();
|
|
129
|
+
|
|
130
|
+
return runWithRequestContext(
|
|
131
|
+
{ logger: ctx.logger, requestId, startTime },
|
|
132
|
+
async () => {
|
|
133
|
+
const resolved = await discovery.register(services);
|
|
134
|
+
return opts.next({
|
|
135
|
+
ctx: { ...opts.ctx, ...resolved } as typeof opts.ctx &
|
|
136
|
+
ServiceRecord<T>,
|
|
137
|
+
});
|
|
138
|
+
},
|
|
139
|
+
);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
// Tag the inner middleware function with the requested services so external
|
|
143
|
+
// tooling (e.g. detect-procedures route generators) can introspect a
|
|
144
|
+
// procedure's service dependencies without re-executing middleware.
|
|
145
|
+
const middlewares = (
|
|
146
|
+
builder as unknown as { _middlewares?: Array<{ _services?: Service[] }> }
|
|
147
|
+
)._middlewares;
|
|
148
|
+
if (middlewares?.length) {
|
|
149
|
+
const last = middlewares[middlewares.length - 1];
|
|
150
|
+
if (last) last._services = services as unknown as Service[];
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
return builder as TRPCMiddlewareBuilder<
|
|
154
|
+
TContext,
|
|
155
|
+
TMeta,
|
|
156
|
+
ServiceRecord<T>,
|
|
157
|
+
unknown
|
|
158
|
+
>;
|
|
159
|
+
}) as ServicesMiddleware<TContext, TMeta>;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/**
|
|
163
|
+
* Create a tRPC middleware that establishes a request context for downstream
|
|
164
|
+
* code without resolving any services. Useful when services aren't needed on
|
|
165
|
+
* a procedure but the handler (or libraries it calls) still wants to read
|
|
166
|
+
* `serviceContext.getLogger()` / `getRequestId()` / `getRequestStartTime()`.
|
|
167
|
+
*
|
|
168
|
+
* `requestId` and `startTime` are pulled from the tRPC context when present,
|
|
169
|
+
* otherwise generated (`crypto.randomUUID()` and `Date.now()`).
|
|
170
|
+
*
|
|
171
|
+
* @example
|
|
172
|
+
* ```ts
|
|
173
|
+
* const withRequestContext = createRequestContextMiddleware(t.middleware);
|
|
174
|
+
* export const baseProcedure = t.procedure.use(withRequestContext);
|
|
175
|
+
* ```
|
|
176
|
+
*/
|
|
177
|
+
export function createRequestContextMiddleware<
|
|
178
|
+
TContext extends ContextWithLogger & object,
|
|
179
|
+
TMeta extends object,
|
|
180
|
+
>(
|
|
181
|
+
mw: CreateMiddleware<TContext, TMeta>,
|
|
182
|
+
): TRPCMiddlewareBuilder<TContext, TMeta, object, unknown> {
|
|
183
|
+
return mw(async (opts) => {
|
|
184
|
+
const ctx = opts.ctx as TContext;
|
|
185
|
+
const requestId = ctx.requestId ?? crypto.randomUUID();
|
|
186
|
+
const startTime = ctx.startTime ?? Date.now();
|
|
187
|
+
return runWithRequestContext(
|
|
188
|
+
{ logger: ctx.logger, requestId, startTime },
|
|
189
|
+
() => opts.next(),
|
|
190
|
+
);
|
|
191
|
+
});
|
|
192
|
+
}
|