@temporary-name/server 1.9.3-alpha.21b0289906d115f2f3db137ea407a6d8d50b5ad6 → 1.9.3-alpha.25c9bb040aec8c367ea668ebd2fedbdb6ee024ff
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/dist/adapters/aws-lambda/index.d.mts +5 -6
- package/dist/adapters/aws-lambda/index.d.ts +5 -6
- package/dist/adapters/aws-lambda/index.mjs +5 -6
- package/dist/adapters/fetch/index.d.mts +8 -85
- package/dist/adapters/fetch/index.d.ts +8 -85
- package/dist/adapters/fetch/index.mjs +17 -157
- package/dist/adapters/node/index.d.mts +9 -63
- package/dist/adapters/node/index.d.ts +9 -63
- package/dist/adapters/node/index.mjs +15 -122
- package/dist/handler/index.d.mts +28 -0
- package/dist/handler/index.d.ts +28 -0
- package/dist/handler/index.mjs +8 -0
- package/dist/helpers/index.mjs +3 -29
- package/dist/index.d.mts +355 -206
- package/dist/index.d.ts +355 -206
- package/dist/index.mjs +465 -163
- package/dist/openapi/index.d.mts +18 -53
- package/dist/openapi/index.d.ts +18 -53
- package/dist/openapi/index.mjs +391 -368
- package/dist/shared/server.0XttqWC4.mjs +339 -0
- package/dist/shared/server.BT6UIZKq.mjs +432 -0
- package/dist/shared/server.C1RJffw4.mjs +30 -0
- package/dist/shared/server.CDPDcFfG.d.ts +39 -0
- package/dist/shared/server.CjPiuQYH.d.mts +51 -0
- package/dist/shared/server.CjPiuQYH.d.ts +51 -0
- package/dist/shared/server.CqRXKroQ.mjs +156 -0
- package/dist/shared/server.gacqwfQ1.mjs +523 -0
- package/dist/shared/server.pPvU6DyC.d.mts +39 -0
- package/dist/shared/server.yrTiAhAF.d.mts +515 -0
- package/dist/shared/server.yrTiAhAF.d.ts +515 -0
- package/package.json +13 -31
- package/dist/adapters/standard/index.d.mts +0 -30
- package/dist/adapters/standard/index.d.ts +0 -30
- package/dist/adapters/standard/index.mjs +0 -9
- package/dist/plugins/index.d.mts +0 -159
- package/dist/plugins/index.d.ts +0 -159
- package/dist/plugins/index.mjs +0 -288
- package/dist/shared/server.7aL9gcoU.d.mts +0 -23
- package/dist/shared/server.BL2R5jcp.d.mts +0 -228
- package/dist/shared/server.BL2R5jcp.d.ts +0 -228
- package/dist/shared/server.CttFCjkj.mjs +0 -255
- package/dist/shared/server.D6Qs_UcF.d.mts +0 -55
- package/dist/shared/server.DFptr1Nz.d.ts +0 -23
- package/dist/shared/server.DmGicgbG.mjs +0 -413
- package/dist/shared/server.DpoO_ER_.d.ts +0 -55
- package/dist/shared/server.JtIZ8YG7.mjs +0 -237
package/dist/index.mjs
CHANGED
|
@@ -1,11 +1,79 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export {
|
|
3
|
-
import
|
|
4
|
-
export { AsyncIteratorClass, EventPublisher, ORPCError, asyncIteratorToStream as eventIteratorToStream, isDefinedError, onError, onFinish, onStart, onSuccess, safe, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
|
|
1
|
+
import { assertNever, splitFirst, onError, isObject, toArray, guard, resolveMaybeOptionalOptions, isTypescriptObject, isPropertyKey } from '@temporary-name/shared';
|
|
2
|
+
export { AsyncIteratorClass, EventPublisher, asyncIteratorToStream as eventIteratorToStream, onError, onFinish, onStart, onSuccess, streamToAsyncIteratorClass as streamToEventIterator } from '@temporary-name/shared';
|
|
3
|
+
import * as z from '@temporary-name/zod';
|
|
5
4
|
import { SchemaClass, object, core, gatingContext } from '@temporary-name/zod';
|
|
6
|
-
import { P as Procedure,
|
|
7
|
-
export { L as LAZY_SYMBOL,
|
|
5
|
+
import { U as UnauthorizedError, P as Procedure, m as mergePrefix, a as mergeTags, b as enhanceRouter, C as Contract, p as parseEndpointDefinition, c as mergeRoute, d as prefixRoute, f as addMiddleware, I as InternalServerError, N as NotFoundError, F as ForbiddenError, B as BadRequestError, l as lazyInternal, h as getLazyMeta, u as unlazy, j as isProcedure } from './shared/server.BT6UIZKq.mjs';
|
|
6
|
+
export { A as ApiError, y as BadGatewayError, n as ConflictError, q as ContentTooLargeError, G as GatewayTimeoutError, L as LAZY_SYMBOL, M as MethodNotAllowedError, k as NotAcceptableError, x as NotImplementedError, o as PreconditionFailedError, R as RequestTimeoutError, S as ServiceUnavailableError, T as TooManyRequestsError, w as UnprocessableContentError, v as UnsupportedMediaTypeError, V as ValidationError, K as createAccessibleLazyRouter, e as encodeError, W as endpointRegex, g as getDynamicParams, J as getRouter, i as isApiErrorStatus, X as isDevelopment, D as isLazy, E as isStartWithMiddlewares, z as lazy, H as mergeMiddlewares, r as resolveContractProcedures, s as standardizeHTTPPath, t as toApiError, O as traverseContractProcedures, Q as unlazyRouter } from './shared/server.BT6UIZKq.mjs';
|
|
7
|
+
import { g as getCookie } from './shared/server.C1RJffw4.mjs';
|
|
8
|
+
import { c as createProcedureClient } from './shared/server.CqRXKroQ.mjs';
|
|
9
|
+
export { m as mergeCurrentContext, a as middlewareOutputFn } from './shared/server.CqRXKroQ.mjs';
|
|
10
|
+
import { J as JsonSchemaXNativeType } from './shared/server.gacqwfQ1.mjs';
|
|
11
|
+
export { b as JSON_SCHEMA_INPUT_REGISTRY, c as JSON_SCHEMA_OUTPUT_REGISTRY, a as JSON_SCHEMA_REGISTRY, Z as ZodToJsonSchemaConverter, e as eventIterator, g as getEventIteratorSchemaDetails } from './shared/server.gacqwfQ1.mjs';
|
|
8
12
|
export { getEventMeta, withEventMeta } from '@temporary-name/standard-server';
|
|
13
|
+
import 'cookie';
|
|
14
|
+
import '@temporary-name/server/openapi';
|
|
15
|
+
import 'zod/v4/core';
|
|
16
|
+
|
|
17
|
+
function validateTokenPrefix(prefix, token) {
|
|
18
|
+
if (prefix && !token.startsWith(prefix)) {
|
|
19
|
+
throw new UnauthorizedError({ message: `Invalid auth token. It must start with "${prefix}"` });
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function validateTokenAuth(config, token, options) {
|
|
23
|
+
const { tokenPrefix, validate } = config;
|
|
24
|
+
validateTokenPrefix(tokenPrefix, token);
|
|
25
|
+
return validate(token, options);
|
|
26
|
+
}
|
|
27
|
+
function runAuth(config, options) {
|
|
28
|
+
switch (config.type) {
|
|
29
|
+
case "header": {
|
|
30
|
+
const authHeader = options.request.headers.get(config.name);
|
|
31
|
+
return authHeader ? validateTokenAuth(config, authHeader, options) : void 0;
|
|
32
|
+
}
|
|
33
|
+
case "query": {
|
|
34
|
+
const { name, tokenPrefix, validate } = config;
|
|
35
|
+
const query = options.request.url.searchParams;
|
|
36
|
+
const token = query.get(name);
|
|
37
|
+
if (!token) return void 0;
|
|
38
|
+
validateTokenPrefix(tokenPrefix, token);
|
|
39
|
+
return validate(token, options);
|
|
40
|
+
}
|
|
41
|
+
case "cookie": {
|
|
42
|
+
const cookie = getCookie(options.request.headers, config.name);
|
|
43
|
+
return cookie ? validateTokenAuth(config, cookie, options) : void 0;
|
|
44
|
+
}
|
|
45
|
+
case "bearer": {
|
|
46
|
+
const authHeader = options.request.headers.get("Authorization");
|
|
47
|
+
if (!authHeader) return void 0;
|
|
48
|
+
const [authType, bearer] = splitFirst(authHeader, " ");
|
|
49
|
+
return authType === "Bearer" ? validateTokenAuth(config, bearer, options) : void 0;
|
|
50
|
+
}
|
|
51
|
+
case "basic": {
|
|
52
|
+
const authHeader = options.request.headers.get("Authorization");
|
|
53
|
+
if (!authHeader) return void 0;
|
|
54
|
+
const [authType, encoded] = splitFirst(authHeader, " ");
|
|
55
|
+
if (authType !== "Basic") return void 0;
|
|
56
|
+
const decoded = Buffer.from(encoded, "base64").toString("utf-8");
|
|
57
|
+
const [username, password] = splitFirst(decoded, ":");
|
|
58
|
+
validateTokenPrefix(config.tokenPrefix, password);
|
|
59
|
+
return config.validate(username, password, options);
|
|
60
|
+
}
|
|
61
|
+
case "none": {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
default: {
|
|
65
|
+
assertNever(config);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
function authDescription(config) {
|
|
70
|
+
const { type } = config;
|
|
71
|
+
return type === "basic" ? "a Basic Authentication header" : type === "bearer" ? "a Bearer Authentication header" : type === "header" ? `a header named "${config.name}"` : type === "query" ? `a query parameter named "${config.name}"` : type === "cookie" ? `a cookie named "${config.name}"` : type === "none" ? "no authentication" : assertNever(type);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function mergeMeta(meta1, meta2) {
|
|
75
|
+
return { ...meta1, ...meta2 };
|
|
76
|
+
}
|
|
9
77
|
|
|
10
78
|
class DecoratedProcedure extends Procedure {
|
|
11
79
|
/**
|
|
@@ -26,24 +94,19 @@ class DecoratedProcedure extends Procedure {
|
|
|
26
94
|
}
|
|
27
95
|
}
|
|
28
96
|
|
|
29
|
-
|
|
97
|
+
const initialSchemas = {
|
|
98
|
+
pathSchema: z.strictObject({}),
|
|
99
|
+
querySchema: z.strictObject({}),
|
|
100
|
+
bodySchema: z.strictObject({}),
|
|
101
|
+
outputSchema: z.unknown()
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
class ProcedureBuilder extends Contract {
|
|
30
105
|
z;
|
|
31
106
|
constructor(def) {
|
|
32
107
|
super(def);
|
|
33
108
|
this.z = new SchemaClass();
|
|
34
109
|
}
|
|
35
|
-
/**
|
|
36
|
-
* Adds type-safe custom errors to the contract.
|
|
37
|
-
* The provided errors are spared-merged with any existing errors in the contract.
|
|
38
|
-
*
|
|
39
|
-
* @see {@link https://orpc.unnoq.com/docs/error-handling#type%E2%80%90safe-error-handling Type-Safe Error Handling Docs}
|
|
40
|
-
*/
|
|
41
|
-
errors(errors) {
|
|
42
|
-
return new ProcedureBuilder({
|
|
43
|
-
...this["~orpc"],
|
|
44
|
-
errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
110
|
/**
|
|
48
111
|
* Sets or updates the metadata for the contract.
|
|
49
112
|
* The provided metadata is spared-merged with any existing metadata in the contract.
|
|
@@ -119,19 +182,46 @@ class ProcedureBuilder extends ContractProcedure {
|
|
|
119
182
|
outputValidationIndex: this["~orpc"].middlewares.length
|
|
120
183
|
});
|
|
121
184
|
}
|
|
122
|
-
/**
|
|
123
|
-
* Uses a middleware to modify the context or improve the pipeline.
|
|
124
|
-
*
|
|
125
|
-
* @info Supports both normal middleware and inline middleware implementations.
|
|
126
|
-
* @note The current context must be satisfy middleware dependent-context
|
|
127
|
-
* @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
|
|
128
|
-
*/
|
|
129
185
|
use(middleware) {
|
|
130
186
|
return new this.constructor({
|
|
131
187
|
...this["~orpc"],
|
|
132
188
|
middlewares: addMiddleware(this["~orpc"].middlewares, middleware)
|
|
133
189
|
});
|
|
134
190
|
}
|
|
191
|
+
useErrors(errorMap) {
|
|
192
|
+
return new this.constructor({
|
|
193
|
+
...this["~orpc"],
|
|
194
|
+
errorMap: { ...this["~orpc"].errorMap, ...errorMap }
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
// The default of false for ValidatedAuthContext is used when you pass in the type 'none'. We use false
|
|
198
|
+
// because we can't use null or undefined (see ValidatedAuthContext) but we still want it to be falsy.
|
|
199
|
+
useAuth(config) {
|
|
200
|
+
const middleware = baseApi.$context().middleware(async (options) => {
|
|
201
|
+
const { next, context } = options;
|
|
202
|
+
if (context.auth) return next();
|
|
203
|
+
const auth = await runAuth(config, options);
|
|
204
|
+
if (auth === void 0) {
|
|
205
|
+
const { authConfigs } = options.procedure["~orpc"];
|
|
206
|
+
if (context.auth !== false && config === authConfigs.at(-1)) {
|
|
207
|
+
let authDescriptions = authConfigs.map(authDescription).join(", ");
|
|
208
|
+
if (authConfigs.length > 1) {
|
|
209
|
+
authDescriptions = `one of: ${authDescriptions}`;
|
|
210
|
+
}
|
|
211
|
+
throw new UnauthorizedError({
|
|
212
|
+
message: `Authentication required. You must provide ${authDescriptions}`
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
return next();
|
|
216
|
+
}
|
|
217
|
+
return next({ context: { auth } });
|
|
218
|
+
});
|
|
219
|
+
return new this.constructor({
|
|
220
|
+
...this["~orpc"],
|
|
221
|
+
authConfigs: [...this["~orpc"].authConfigs, config],
|
|
222
|
+
middlewares: addMiddleware(this["~orpc"].middlewares, middleware)
|
|
223
|
+
});
|
|
224
|
+
}
|
|
135
225
|
useGating(gates, isGateEnabled) {
|
|
136
226
|
return this.use(({ next, context }) => {
|
|
137
227
|
return gatingContext.run(
|
|
@@ -146,6 +236,9 @@ class ProcedureBuilder extends ContractProcedure {
|
|
|
146
236
|
* @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
|
|
147
237
|
*/
|
|
148
238
|
handler(handler) {
|
|
239
|
+
if (this["~orpc"].schemas.outputSchema === initialSchemas.outputSchema) {
|
|
240
|
+
throw new Error("You must call .output() before calling .handler()");
|
|
241
|
+
}
|
|
149
242
|
return new DecoratedProcedure({
|
|
150
243
|
...this["~orpc"],
|
|
151
244
|
handler
|
|
@@ -197,31 +290,6 @@ function decorateMiddleware(middleware) {
|
|
|
197
290
|
);
|
|
198
291
|
return mapped;
|
|
199
292
|
};
|
|
200
|
-
decorated.concat = (concatMiddleware, mapInput) => {
|
|
201
|
-
const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
|
|
202
|
-
const concatted = decorateMiddleware((options, input, output, ...rest) => {
|
|
203
|
-
const merged = middleware(
|
|
204
|
-
{
|
|
205
|
-
...options,
|
|
206
|
-
next: (...[nextOptions1]) => mapped(
|
|
207
|
-
{
|
|
208
|
-
...options,
|
|
209
|
-
context: { ...options.context, ...nextOptions1?.context },
|
|
210
|
-
next: (...[nextOptions2]) => options.next({ context: { ...nextOptions1?.context, ...nextOptions2?.context } })
|
|
211
|
-
},
|
|
212
|
-
input,
|
|
213
|
-
output,
|
|
214
|
-
...rest
|
|
215
|
-
)
|
|
216
|
-
},
|
|
217
|
-
input,
|
|
218
|
-
output,
|
|
219
|
-
...rest
|
|
220
|
-
);
|
|
221
|
-
return merged;
|
|
222
|
-
});
|
|
223
|
-
return concatted;
|
|
224
|
-
};
|
|
225
293
|
return decorated;
|
|
226
294
|
}
|
|
227
295
|
|
|
@@ -243,98 +311,348 @@ class Builder extends BuilderWithMiddlewares {
|
|
|
243
311
|
return decorateMiddleware(middleware);
|
|
244
312
|
}
|
|
245
313
|
}
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
}
|
|
264
|
-
const os = createApiBuilder();
|
|
314
|
+
const baseApi = new Builder({
|
|
315
|
+
route: {},
|
|
316
|
+
meta: {},
|
|
317
|
+
errorMap: { BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, InternalServerError },
|
|
318
|
+
inputValidationIndex: 0,
|
|
319
|
+
outputValidationIndex: 0,
|
|
320
|
+
middlewares: [
|
|
321
|
+
onError((error, _options) => {
|
|
322
|
+
console.dir(error, { depth: null });
|
|
323
|
+
})
|
|
324
|
+
],
|
|
325
|
+
schemas: initialSchemas,
|
|
326
|
+
// NB: this is a relic from orpc -- I'm not convinced there's a need for this (or if there is, that it's
|
|
327
|
+
// the best solution). For now I've removed the interface to configure it externally.
|
|
328
|
+
dedupeLeadingMiddlewares: true,
|
|
329
|
+
authConfigs: []
|
|
330
|
+
});
|
|
265
331
|
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
inputValidationIndex: middlewares.length,
|
|
272
|
-
outputValidationIndex: middlewares.length,
|
|
273
|
-
dedupeLeadingMiddlewares: true
|
|
274
|
-
});
|
|
275
|
-
return impl2;
|
|
332
|
+
const FLEXIBLE_DATE_FORMAT_REGEX = /^[^-]+-[^-]+-[^-]+$/;
|
|
333
|
+
class experimental_JsonSchemaCoercer {
|
|
334
|
+
coerce(schema, value, options = {}) {
|
|
335
|
+
const [, coerced] = this.#coerce(schema, value, options);
|
|
336
|
+
return coerced;
|
|
276
337
|
}
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
return setHiddenRouterContract(adapted, contract);
|
|
299
|
-
};
|
|
338
|
+
#coerce(schema, originalValue, options) {
|
|
339
|
+
if (typeof schema === "boolean") {
|
|
340
|
+
return [schema, originalValue];
|
|
341
|
+
}
|
|
342
|
+
if (Array.isArray(schema.type)) {
|
|
343
|
+
return this.#coerce(
|
|
344
|
+
{
|
|
345
|
+
anyOf: schema.type.map((type) => ({ ...schema, type }))
|
|
346
|
+
},
|
|
347
|
+
originalValue,
|
|
348
|
+
options
|
|
349
|
+
);
|
|
350
|
+
}
|
|
351
|
+
let coerced = originalValue;
|
|
352
|
+
let satisfied = true;
|
|
353
|
+
if (typeof schema.$ref === "string") {
|
|
354
|
+
const refSchema = options?.components?.[schema.$ref];
|
|
355
|
+
if (refSchema !== void 0) {
|
|
356
|
+
const [subSatisfied, subCoerced] = this.#coerce(refSchema, coerced, options);
|
|
357
|
+
coerced = subCoerced;
|
|
358
|
+
satisfied = subSatisfied;
|
|
300
359
|
}
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
360
|
+
}
|
|
361
|
+
const enumValues = schema.const !== void 0 ? [schema.const] : schema.enum;
|
|
362
|
+
if (enumValues !== void 0 && !enumValues.includes(coerced)) {
|
|
363
|
+
if (typeof coerced === "string") {
|
|
364
|
+
const numberValue = this.#stringToNumber(coerced);
|
|
365
|
+
if (enumValues.includes(numberValue)) {
|
|
366
|
+
coerced = numberValue;
|
|
367
|
+
} else {
|
|
368
|
+
const booleanValue = this.#stringToBoolean(coerced);
|
|
369
|
+
if (enumValues.includes(booleanValue)) {
|
|
370
|
+
coerced = booleanValue;
|
|
371
|
+
} else {
|
|
372
|
+
satisfied = false;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
} else {
|
|
376
|
+
satisfied = false;
|
|
304
377
|
}
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
378
|
+
}
|
|
379
|
+
if (typeof schema.type === "string") {
|
|
380
|
+
switch (schema.type) {
|
|
381
|
+
case "null": {
|
|
382
|
+
if (coerced !== null) {
|
|
383
|
+
satisfied = false;
|
|
384
|
+
}
|
|
385
|
+
break;
|
|
386
|
+
}
|
|
387
|
+
case "string": {
|
|
388
|
+
if (typeof coerced !== "string") {
|
|
389
|
+
satisfied = false;
|
|
390
|
+
}
|
|
391
|
+
break;
|
|
392
|
+
}
|
|
393
|
+
case "number": {
|
|
394
|
+
if (typeof coerced === "string") {
|
|
395
|
+
coerced = this.#stringToNumber(coerced);
|
|
396
|
+
}
|
|
397
|
+
if (typeof coerced !== "number") {
|
|
398
|
+
satisfied = false;
|
|
310
399
|
}
|
|
311
|
-
|
|
400
|
+
break;
|
|
401
|
+
}
|
|
402
|
+
case "integer": {
|
|
403
|
+
if (typeof coerced === "string") {
|
|
404
|
+
coerced = this.#stringToInteger(coerced);
|
|
405
|
+
}
|
|
406
|
+
if (typeof coerced !== "number" || !Number.isInteger(coerced)) {
|
|
407
|
+
satisfied = false;
|
|
408
|
+
}
|
|
409
|
+
break;
|
|
410
|
+
}
|
|
411
|
+
case "boolean": {
|
|
412
|
+
if (typeof coerced === "string") {
|
|
413
|
+
coerced = this.#stringToBoolean(coerced);
|
|
414
|
+
}
|
|
415
|
+
if (typeof coerced !== "boolean") {
|
|
416
|
+
satisfied = false;
|
|
417
|
+
}
|
|
418
|
+
break;
|
|
419
|
+
}
|
|
420
|
+
case "array": {
|
|
421
|
+
if (Array.isArray(coerced)) {
|
|
422
|
+
const prefixItemSchemas = "prefixItems" in schema ? toArray(schema.prefixItems) : Array.isArray(schema.items) ? schema.items : [];
|
|
423
|
+
const itemSchema = Array.isArray(schema.items) ? schema.additionalItems : schema.items;
|
|
424
|
+
let shouldUseCoercedItems = false;
|
|
425
|
+
const coercedItems = coerced.map((item, i) => {
|
|
426
|
+
const subSchema = prefixItemSchemas[i] ?? itemSchema;
|
|
427
|
+
if (subSchema === void 0) {
|
|
428
|
+
satisfied = false;
|
|
429
|
+
return item;
|
|
430
|
+
}
|
|
431
|
+
const [subSatisfied, subCoerced] = this.#coerce(subSchema, item, options);
|
|
432
|
+
if (!subSatisfied) {
|
|
433
|
+
satisfied = false;
|
|
434
|
+
}
|
|
435
|
+
if (subCoerced !== item) {
|
|
436
|
+
shouldUseCoercedItems = true;
|
|
437
|
+
}
|
|
438
|
+
return subCoerced;
|
|
439
|
+
});
|
|
440
|
+
if (coercedItems.length < prefixItemSchemas.length) {
|
|
441
|
+
satisfied = false;
|
|
442
|
+
}
|
|
443
|
+
if (shouldUseCoercedItems) {
|
|
444
|
+
coerced = coercedItems;
|
|
445
|
+
}
|
|
446
|
+
} else {
|
|
447
|
+
satisfied = false;
|
|
448
|
+
}
|
|
449
|
+
break;
|
|
450
|
+
}
|
|
451
|
+
case "object": {
|
|
452
|
+
if (Array.isArray(coerced)) {
|
|
453
|
+
coerced = { ...coerced };
|
|
454
|
+
}
|
|
455
|
+
if (isObject(coerced)) {
|
|
456
|
+
let shouldUseCoercedItems = false;
|
|
457
|
+
const coercedItems = {};
|
|
458
|
+
const patternProperties = Object.entries(schema.patternProperties ?? {}).map(
|
|
459
|
+
([key, value]) => [new RegExp(key), value]
|
|
460
|
+
);
|
|
461
|
+
for (const key in coerced) {
|
|
462
|
+
const value = coerced[key];
|
|
463
|
+
const subSchema = schema.properties?.[key] ?? patternProperties.find(([pattern]) => pattern.test(key))?.[1] ?? schema.additionalProperties;
|
|
464
|
+
if (value === void 0 && !schema.required?.includes(key)) {
|
|
465
|
+
coercedItems[key] = value;
|
|
466
|
+
} else if (subSchema === void 0) {
|
|
467
|
+
coercedItems[key] = value;
|
|
468
|
+
satisfied = false;
|
|
469
|
+
} else {
|
|
470
|
+
const [subSatisfied, subCoerced] = this.#coerce(subSchema, value, options);
|
|
471
|
+
coercedItems[key] = subCoerced;
|
|
472
|
+
if (!subSatisfied) {
|
|
473
|
+
satisfied = false;
|
|
474
|
+
}
|
|
475
|
+
if (subCoerced !== value) {
|
|
476
|
+
shouldUseCoercedItems = true;
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
if (schema.required?.some((key) => !Object.hasOwn(coercedItems, key))) {
|
|
481
|
+
satisfied = false;
|
|
482
|
+
}
|
|
483
|
+
if (shouldUseCoercedItems) {
|
|
484
|
+
coerced = coercedItems;
|
|
485
|
+
}
|
|
486
|
+
} else {
|
|
487
|
+
satisfied = false;
|
|
488
|
+
}
|
|
489
|
+
break;
|
|
490
|
+
}
|
|
312
491
|
}
|
|
313
|
-
return nextImpl;
|
|
314
492
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
493
|
+
if ("x-native-type" in schema && typeof schema["x-native-type"] === "string") {
|
|
494
|
+
switch (schema["x-native-type"]) {
|
|
495
|
+
case JsonSchemaXNativeType.Date: {
|
|
496
|
+
if (typeof coerced === "string") {
|
|
497
|
+
coerced = this.#stringToDate(coerced);
|
|
498
|
+
}
|
|
499
|
+
if (!(coerced instanceof Date)) {
|
|
500
|
+
satisfied = false;
|
|
501
|
+
}
|
|
502
|
+
break;
|
|
503
|
+
}
|
|
504
|
+
case JsonSchemaXNativeType.BigInt: {
|
|
505
|
+
switch (typeof coerced) {
|
|
506
|
+
case "string":
|
|
507
|
+
coerced = this.#stringToBigInt(coerced);
|
|
508
|
+
break;
|
|
509
|
+
case "number":
|
|
510
|
+
coerced = this.#numberToBigInt(coerced);
|
|
511
|
+
break;
|
|
512
|
+
}
|
|
513
|
+
if (typeof coerced !== "bigint") {
|
|
514
|
+
satisfied = false;
|
|
515
|
+
}
|
|
516
|
+
break;
|
|
517
|
+
}
|
|
518
|
+
case JsonSchemaXNativeType.RegExp: {
|
|
519
|
+
if (typeof coerced === "string") {
|
|
520
|
+
coerced = this.#stringToRegExp(coerced);
|
|
521
|
+
}
|
|
522
|
+
if (!(coerced instanceof RegExp)) {
|
|
523
|
+
satisfied = false;
|
|
524
|
+
}
|
|
525
|
+
break;
|
|
526
|
+
}
|
|
527
|
+
case JsonSchemaXNativeType.Url: {
|
|
528
|
+
if (typeof coerced === "string") {
|
|
529
|
+
coerced = this.#stringToURL(coerced);
|
|
530
|
+
}
|
|
531
|
+
if (!(coerced instanceof URL)) {
|
|
532
|
+
satisfied = false;
|
|
533
|
+
}
|
|
534
|
+
break;
|
|
535
|
+
}
|
|
536
|
+
case JsonSchemaXNativeType.Set: {
|
|
537
|
+
if (Array.isArray(coerced)) {
|
|
538
|
+
coerced = this.#arrayToSet(coerced);
|
|
539
|
+
}
|
|
540
|
+
if (!(coerced instanceof Set)) {
|
|
541
|
+
satisfied = false;
|
|
542
|
+
}
|
|
543
|
+
break;
|
|
544
|
+
}
|
|
545
|
+
case JsonSchemaXNativeType.Map: {
|
|
546
|
+
if (Array.isArray(coerced)) {
|
|
547
|
+
coerced = this.#arrayToMap(coerced);
|
|
548
|
+
}
|
|
549
|
+
if (!(coerced instanceof Map)) {
|
|
550
|
+
satisfied = false;
|
|
551
|
+
}
|
|
552
|
+
break;
|
|
553
|
+
}
|
|
325
554
|
}
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
555
|
+
}
|
|
556
|
+
if (schema.allOf) {
|
|
557
|
+
for (const subSchema of schema.allOf) {
|
|
558
|
+
const [subSatisfied, subCoerced] = this.#coerce(subSchema, coerced, options);
|
|
559
|
+
coerced = subCoerced;
|
|
560
|
+
if (!subSatisfied) {
|
|
561
|
+
satisfied = false;
|
|
562
|
+
}
|
|
329
563
|
}
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
564
|
+
}
|
|
565
|
+
for (const key of ["anyOf", "oneOf"]) {
|
|
566
|
+
if (schema[key]) {
|
|
567
|
+
let bestOptions;
|
|
568
|
+
for (const subSchema of schema[key]) {
|
|
569
|
+
const [subSatisfied, subCoerced] = this.#coerce(subSchema, coerced, options);
|
|
570
|
+
if (subSatisfied) {
|
|
571
|
+
if (!bestOptions || subCoerced === coerced) {
|
|
572
|
+
bestOptions = { coerced: subCoerced, satisfied: subSatisfied };
|
|
573
|
+
}
|
|
574
|
+
if (subCoerced === coerced) {
|
|
575
|
+
break;
|
|
576
|
+
}
|
|
577
|
+
}
|
|
333
578
|
}
|
|
334
|
-
|
|
579
|
+
coerced = bestOptions ? bestOptions.coerced : coerced;
|
|
580
|
+
satisfied = bestOptions ? bestOptions.satisfied : false;
|
|
581
|
+
}
|
|
582
|
+
}
|
|
583
|
+
if (typeof schema.not !== "undefined") {
|
|
584
|
+
const [notSatisfied] = this.#coerce(schema.not, coerced, options);
|
|
585
|
+
if (notSatisfied) {
|
|
586
|
+
satisfied = false;
|
|
587
|
+
}
|
|
588
|
+
}
|
|
589
|
+
return [satisfied, coerced];
|
|
590
|
+
}
|
|
591
|
+
#stringToNumber(value) {
|
|
592
|
+
const num = Number.parseFloat(value);
|
|
593
|
+
if (Number.isNaN(num) || num !== Number(value)) {
|
|
594
|
+
return value;
|
|
595
|
+
}
|
|
596
|
+
return num;
|
|
597
|
+
}
|
|
598
|
+
#stringToInteger(value) {
|
|
599
|
+
const num = Number.parseInt(value);
|
|
600
|
+
if (Number.isNaN(num) || num !== Number(value)) {
|
|
601
|
+
return value;
|
|
602
|
+
}
|
|
603
|
+
return num;
|
|
604
|
+
}
|
|
605
|
+
#stringToBoolean(value) {
|
|
606
|
+
const lower = value.toLowerCase();
|
|
607
|
+
if (lower === "false" || lower === "off") {
|
|
608
|
+
return false;
|
|
609
|
+
}
|
|
610
|
+
if (lower === "true" || lower === "on") {
|
|
611
|
+
return true;
|
|
612
|
+
}
|
|
613
|
+
return value;
|
|
614
|
+
}
|
|
615
|
+
#stringToBigInt(value) {
|
|
616
|
+
return guard(() => BigInt(value)) ?? value;
|
|
617
|
+
}
|
|
618
|
+
#numberToBigInt(value) {
|
|
619
|
+
return guard(() => BigInt(value)) ?? value;
|
|
620
|
+
}
|
|
621
|
+
#stringToDate(value) {
|
|
622
|
+
const date = new Date(value);
|
|
623
|
+
if (Number.isNaN(date.getTime()) || !FLEXIBLE_DATE_FORMAT_REGEX.test(value)) {
|
|
624
|
+
return value;
|
|
335
625
|
}
|
|
336
|
-
|
|
337
|
-
|
|
626
|
+
return date;
|
|
627
|
+
}
|
|
628
|
+
#stringToRegExp(value) {
|
|
629
|
+
const match = value.match(/^\/(.*)\/([a-z]*)$/);
|
|
630
|
+
if (match) {
|
|
631
|
+
const [, pattern, flags] = match;
|
|
632
|
+
return guard(() => new RegExp(pattern, flags)) ?? value;
|
|
633
|
+
}
|
|
634
|
+
return value;
|
|
635
|
+
}
|
|
636
|
+
#stringToURL(value) {
|
|
637
|
+
return guard(() => new URL(value)) ?? value;
|
|
638
|
+
}
|
|
639
|
+
#arrayToSet(value) {
|
|
640
|
+
const set = new Set(value);
|
|
641
|
+
if (set.size !== value.length) {
|
|
642
|
+
return value;
|
|
643
|
+
}
|
|
644
|
+
return set;
|
|
645
|
+
}
|
|
646
|
+
#arrayToMap(value) {
|
|
647
|
+
if (value.some((item) => !Array.isArray(item) || item.length !== 2)) {
|
|
648
|
+
return value;
|
|
649
|
+
}
|
|
650
|
+
const result = new Map(value);
|
|
651
|
+
if (result.size !== value.length) {
|
|
652
|
+
return value;
|
|
653
|
+
}
|
|
654
|
+
return result;
|
|
655
|
+
}
|
|
338
656
|
}
|
|
339
657
|
|
|
340
658
|
function createAssertedLazyProcedure(lazied) {
|
|
@@ -351,42 +669,26 @@ function createAssertedLazyProcedure(lazied) {
|
|
|
351
669
|
}, getLazyMeta(lazied));
|
|
352
670
|
return lazyProcedure;
|
|
353
671
|
}
|
|
354
|
-
function createContractedProcedure(procedure, contract) {
|
|
355
|
-
return new Procedure({
|
|
356
|
-
...procedure["~orpc"],
|
|
357
|
-
errorMap: contract["~orpc"].errorMap,
|
|
358
|
-
route: contract["~orpc"].route,
|
|
359
|
-
meta: contract["~orpc"].meta
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
672
|
function call(procedure, input, ...rest) {
|
|
363
673
|
const options = resolveMaybeOptionalOptions(rest);
|
|
364
674
|
return createProcedureClient(procedure, options)(input, options);
|
|
365
675
|
}
|
|
366
676
|
|
|
367
|
-
function
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
const recursive = new Proxy(procedureCaller, {
|
|
375
|
-
get(target, key) {
|
|
376
|
-
if (typeof key !== "string") {
|
|
377
|
-
return Reflect.get(target, key);
|
|
378
|
-
}
|
|
379
|
-
const next = getRouter(router, [key]);
|
|
380
|
-
if (!next) {
|
|
381
|
-
return Reflect.get(target, key);
|
|
382
|
-
}
|
|
383
|
-
return createRouterClient(next, {
|
|
384
|
-
...rest[0],
|
|
385
|
-
path: [...rest[0]?.path ?? [], key]
|
|
386
|
-
});
|
|
677
|
+
function isSchemaIssue(issue) {
|
|
678
|
+
if (!isTypescriptObject(issue) || typeof issue.message !== "string") {
|
|
679
|
+
return false;
|
|
680
|
+
}
|
|
681
|
+
if (issue.path !== void 0) {
|
|
682
|
+
if (!Array.isArray(issue.path)) {
|
|
683
|
+
return false;
|
|
387
684
|
}
|
|
388
|
-
|
|
389
|
-
|
|
685
|
+
if (!issue.path.every(
|
|
686
|
+
(segment) => isPropertyKey(segment) || isTypescriptObject(segment) && isPropertyKey(segment.key)
|
|
687
|
+
)) {
|
|
688
|
+
return false;
|
|
689
|
+
}
|
|
690
|
+
}
|
|
691
|
+
return true;
|
|
390
692
|
}
|
|
391
693
|
|
|
392
|
-
export { Builder, BuilderWithMiddlewares, DecoratedProcedure, Procedure, ProcedureBuilder, addMiddleware,
|
|
694
|
+
export { BadRequestError, Builder, BuilderWithMiddlewares, Contract, DecoratedProcedure, ForbiddenError, InternalServerError, JsonSchemaXNativeType, NotFoundError, Procedure, ProcedureBuilder, UnauthorizedError, addMiddleware, baseApi, call, createAssertedLazyProcedure, createProcedureClient, decorateMiddleware, enhanceRouter, experimental_JsonSchemaCoercer, getLazyMeta, initialSchemas, isProcedure, isSchemaIssue, lazyInternal, mergeMeta, parseEndpointDefinition, unlazy };
|