better-call 1.0.28 → 1.1.0-beta.1
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/LICENSE +21 -0
- package/README.md +54 -0
- package/dist/client.cjs.map +1 -1
- package/dist/client.d.cts +12 -4
- package/dist/client.d.ts +12 -4
- package/dist/client.js.map +1 -1
- package/dist/index.cjs +26 -15
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +26 -15
- package/dist/index.js.map +1 -1
- package/dist/node.d.cts +1 -1
- package/dist/node.d.ts +1 -1
- package/dist/{router-rGV6mTr8.d.cts → router-DguGh6Qa.d.cts} +24 -9
- package/dist/{router-NaFkuy-s.d.ts → router-EvGJRGFD.d.ts} +24 -9
- package/package.json +3 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2025 Bereket Engida
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -412,6 +412,60 @@ Bun.serve({
|
|
|
412
412
|
|
|
413
413
|
Behind the scenes, the router uses [rou3](https://github.com/unjs/rou3) to match the endpoints and invoke the correct endpoint. You can look at the [rou3 documentation](https://github.com/unjs/rou3) for more information.
|
|
414
414
|
|
|
415
|
+
#### Virtual endpoints
|
|
416
|
+
|
|
417
|
+
You can create virtual endpoints by completely omitting the `path`. Virtual endpoints do not get exposed for routing, do not generate OpenAPI docs and cannot be inferred through the [RPC client](#rpc-client), but they can still be invoked directly:
|
|
418
|
+
|
|
419
|
+
```ts
|
|
420
|
+
import { createEndpoint, createRouter } from "better-call";
|
|
421
|
+
|
|
422
|
+
const endpoint = createEndpoint({
|
|
423
|
+
method: "GET",
|
|
424
|
+
}, async (ctx) => {
|
|
425
|
+
return "ok";
|
|
426
|
+
})
|
|
427
|
+
|
|
428
|
+
const response = await endpoint(); // this works
|
|
429
|
+
|
|
430
|
+
const router = createRouter({ endpoint })
|
|
431
|
+
|
|
432
|
+
Bun.serve({
|
|
433
|
+
fetch: router.handler // endpoint won't be routed through the router handler
|
|
434
|
+
});
|
|
435
|
+
|
|
436
|
+
```
|
|
437
|
+
|
|
438
|
+
#### Scoped endpoints
|
|
439
|
+
|
|
440
|
+
You can also create endpoints that are exposed for routing, but that cannot be inferred through the client by using the `metadata.scope` option:
|
|
441
|
+
|
|
442
|
+
- `rpc` - the endpoint is exposed to the router, can be invoked directly and is available to the [RPC client](#rpc-client)
|
|
443
|
+
- `server` - the endpoint is exposed to the router, can be invoked directly, but is not available to the client
|
|
444
|
+
- `http` - the endpoint is only exposed to the router
|
|
445
|
+
|
|
446
|
+
```ts
|
|
447
|
+
import { createEndpoint, createRouter } from "better-call";
|
|
448
|
+
|
|
449
|
+
const endpoint = createEndpoint("/item", {
|
|
450
|
+
method: "GET",
|
|
451
|
+
metadata: {
|
|
452
|
+
scope: "server"
|
|
453
|
+
},
|
|
454
|
+
}, async (ctx) => {
|
|
455
|
+
return "ok";
|
|
456
|
+
})
|
|
457
|
+
|
|
458
|
+
const response = await endpoint(); // this works
|
|
459
|
+
|
|
460
|
+
const router = createRouter({
|
|
461
|
+
endpoint
|
|
462
|
+
})
|
|
463
|
+
|
|
464
|
+
Bun.serve({
|
|
465
|
+
fetch: router.handler // endpoint won't be routed through the router handler
|
|
466
|
+
})
|
|
467
|
+
```
|
|
468
|
+
|
|
415
469
|
#### Router Options
|
|
416
470
|
|
|
417
471
|
**routerMiddleware:**
|
package/dist/client.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.cjs","names":["options"],"sources":["../src/client.ts"],"sourcesContent":["import { type BetterFetchOption, type BetterFetchResponse, createFetch } from \"@better-fetch/fetch\";\nimport type { Router } from \"./router\";\nimport type { HasRequiredKeys, Prettify, UnionToIntersection } from \"./helper\";\nimport type { Endpoint } from \"./endpoint\";\n\ntype HasRequired<\n\tT extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = T[\"body\"] extends object\n\t? HasRequiredKeys<T[\"body\"]> extends true\n\t\t? true\n\t\t: T[\"query\"] extends object\n\t\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t\t? true\n\t\t\t\t: T[\"params\"] extends object\n\t\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t\t: false\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t: T[\"query\"] extends object\n\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t? true\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t\t: T[\"params\"] extends object\n\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t: false;\n\ntype InferContext<T> = T extends (ctx: infer Ctx) => any\n\t? Ctx extends object\n\t\t? Ctx\n\t\t: never\n\t: never;\n\nexport interface ClientOptions extends BetterFetchOption {\n\tbaseURL: string;\n}\n\ntype WithRequired<T, K> = T & {\n\t[P in K extends string ? K : never]-?: T[P extends keyof T ? P : never];\n};\n\ntype
|
|
1
|
+
{"version":3,"file":"client.cjs","names":["options"],"sources":["../src/client.ts"],"sourcesContent":["import { type BetterFetchOption, type BetterFetchResponse, createFetch } from \"@better-fetch/fetch\";\nimport type { Router } from \"./router\";\nimport type { HasRequiredKeys, Prettify, UnionToIntersection } from \"./helper\";\nimport type { Endpoint } from \"./endpoint\";\n\ntype HasRequired<\n\tT extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = T[\"body\"] extends object\n\t? HasRequiredKeys<T[\"body\"]> extends true\n\t\t? true\n\t\t: T[\"query\"] extends object\n\t\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t\t? true\n\t\t\t\t: T[\"params\"] extends object\n\t\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t\t: false\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t: T[\"query\"] extends object\n\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t? true\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t\t: T[\"params\"] extends object\n\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t: false;\n\ntype InferContext<T> = T extends (ctx: infer Ctx) => any\n\t? Ctx extends object\n\t\t? Ctx\n\t\t: never\n\t: never;\n\nexport interface ClientOptions extends BetterFetchOption {\n\tbaseURL: string;\n}\n\ntype WithRequired<T, K> = T & {\n\t[P in K extends string ? K : never]-?: T[P extends keyof T ? P : never];\n};\n\ntype InferClientRoutes<T extends Record<string, Endpoint>> = {\n\t[K in keyof T]: T[K] extends Endpoint<any, infer O>\n\t\t? O extends\n\t\t\t\t| { metadata: { scope: \"http\" } }\n\t\t\t\t| { metadata: { scope: \"server\" } }\n\t\t\t\t| { metadata: { SERVER_ONLY: true } }\n\t\t\t? never\n\t\t\t: T[K]\n\t\t: T[K];\n};\n\nexport type RequiredOptionKeys<\n\tC extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = (undefined extends C[\"body\"]\n\t? {}\n\t: {\n\t\t\tbody: true;\n\t\t}) &\n\t(undefined extends C[\"query\"]\n\t\t? {}\n\t\t: {\n\t\t\t\tquery: true;\n\t\t\t}) &\n\t(undefined extends C[\"params\"]\n\t\t? {}\n\t\t: {\n\t\t\t\tparams: true;\n\t\t\t});\n\nexport const createClient = <R extends Router | Router[\"endpoints\"]>(options: ClientOptions) => {\n\tconst fetch = createFetch(options);\n\ttype API = InferClientRoutes<\n\t\tR extends { endpoints: Record<string, Endpoint> } ? R[\"endpoints\"] : R\n\t>;\n\ttype Options = API extends {\n\t\t[key: string]: infer T;\n\t}\n\t\t? T extends Endpoint\n\t\t\t? {\n\t\t\t\t\t[key in T[\"options\"][\"method\"] extends \"GET\"\n\t\t\t\t\t\t? T[\"path\"]\n\t\t\t\t\t\t: `@${T[\"options\"][\"method\"] extends string ? Lowercase<T[\"options\"][\"method\"]> : never}${T[\"path\"]}`]: T;\n\t\t\t\t}\n\t\t\t: {}\n\t\t: {};\n\n\ttype O = Prettify<UnionToIntersection<Options>>;\n\treturn async <OPT extends O, K extends keyof OPT, C extends InferContext<OPT[K]>>(\n\t\tpath: K,\n\t\t...options: HasRequired<C> extends true\n\t\t\t? [\n\t\t\t\t\tWithRequired<\n\t\t\t\t\t\tBetterFetchOption<C[\"body\"], C[\"query\"], C[\"params\"]>,\n\t\t\t\t\t\tkeyof RequiredOptionKeys<C>\n\t\t\t\t\t>,\n\t\t\t\t]\n\t\t\t: [BetterFetchOption<C[\"body\"], C[\"query\"], C[\"params\"]>?]\n\t): Promise<\n\t\tBetterFetchResponse<Awaited<ReturnType<OPT[K] extends Endpoint ? OPT[K] : never>>>\n\t> => {\n\t\treturn (await fetch(path as string, {\n\t\t\t...options[0],\n\t\t})) as any;\n\t};\n};\n"],"mappings":";;;;;AAgFA,MAAa,gBAAwD,YAA2B;CAC/F,MAAM,8CAAoB,QAAQ;AAiBlC,QAAO,OACN,MACA,GAAGA,cAUC;AACJ,SAAQ,MAAM,MAAM,MAAgB,EACnC,GAAGA,UAAQ,IACX,CAAC"}
|
package/dist/client.d.cts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-
|
|
1
|
+
import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-DguGh6Qa.cjs";
|
|
2
2
|
import { BetterFetchOption, BetterFetchResponse } from "@better-fetch/fetch";
|
|
3
3
|
|
|
4
4
|
//#region src/client.d.ts
|
|
@@ -12,7 +12,15 @@ interface ClientOptions extends BetterFetchOption {
|
|
|
12
12
|
baseURL: string;
|
|
13
13
|
}
|
|
14
14
|
type WithRequired<T, K> = T & { [P in K extends string ? K : never]-?: T[P extends keyof T ? P : never] };
|
|
15
|
-
type
|
|
15
|
+
type InferClientRoutes<T extends Record<string, Endpoint>> = { [K in keyof T]: T[K] extends Endpoint<any, infer O> ? O extends {
|
|
16
|
+
metadata: {
|
|
17
|
+
scope: "http";
|
|
18
|
+
};
|
|
19
|
+
} | {
|
|
20
|
+
metadata: {
|
|
21
|
+
scope: "server";
|
|
22
|
+
};
|
|
23
|
+
} | {
|
|
16
24
|
metadata: {
|
|
17
25
|
SERVER_ONLY: true;
|
|
18
26
|
};
|
|
@@ -28,11 +36,11 @@ type RequiredOptionKeys<C extends {
|
|
|
28
36
|
}) & (undefined extends C["params"] ? {} : {
|
|
29
37
|
params: true;
|
|
30
38
|
});
|
|
31
|
-
declare const createClient: <R extends Router | Router["endpoints"]>(options: ClientOptions) => <OPT extends (UnionToIntersection<
|
|
39
|
+
declare const createClient: <R extends Router | Router["endpoints"]>(options: ClientOptions) => <OPT extends (UnionToIntersection<InferClientRoutes<R extends {
|
|
32
40
|
endpoints: Record<string, Endpoint>;
|
|
33
41
|
} ? R["endpoints"] : R> extends {
|
|
34
42
|
[key: string]: infer T_1;
|
|
35
|
-
} ? T_1 extends Endpoint ? { [key in T_1["options"]["method"] extends "GET" ? T_1["path"] : `@${T_1["options"]["method"] extends string ? Lowercase<T_1["options"]["method"]> : never}${T_1["path"]}`]: T_1 } : {} : {}> extends infer T ? { [K_1 in keyof T]: UnionToIntersection<
|
|
43
|
+
} ? T_1 extends Endpoint ? { [key in T_1["options"]["method"] extends "GET" ? T_1["path"] : `@${T_1["options"]["method"] extends string ? Lowercase<T_1["options"]["method"]> : never}${T_1["path"]}`]: T_1 } : {} : {}> extends infer T ? { [K_1 in keyof T]: UnionToIntersection<InferClientRoutes<R extends {
|
|
36
44
|
endpoints: Record<string, Endpoint>;
|
|
37
45
|
} ? R["endpoints"] : R> extends {
|
|
38
46
|
[key: string]: infer T_1;
|
package/dist/client.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-
|
|
1
|
+
import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-EvGJRGFD.js";
|
|
2
2
|
import { BetterFetchOption, BetterFetchResponse } from "@better-fetch/fetch";
|
|
3
3
|
|
|
4
4
|
//#region src/client.d.ts
|
|
@@ -12,7 +12,15 @@ interface ClientOptions extends BetterFetchOption {
|
|
|
12
12
|
baseURL: string;
|
|
13
13
|
}
|
|
14
14
|
type WithRequired<T, K> = T & { [P in K extends string ? K : never]-?: T[P extends keyof T ? P : never] };
|
|
15
|
-
type
|
|
15
|
+
type InferClientRoutes<T extends Record<string, Endpoint>> = { [K in keyof T]: T[K] extends Endpoint<any, infer O> ? O extends {
|
|
16
|
+
metadata: {
|
|
17
|
+
scope: "http";
|
|
18
|
+
};
|
|
19
|
+
} | {
|
|
20
|
+
metadata: {
|
|
21
|
+
scope: "server";
|
|
22
|
+
};
|
|
23
|
+
} | {
|
|
16
24
|
metadata: {
|
|
17
25
|
SERVER_ONLY: true;
|
|
18
26
|
};
|
|
@@ -28,11 +36,11 @@ type RequiredOptionKeys<C extends {
|
|
|
28
36
|
}) & (undefined extends C["params"] ? {} : {
|
|
29
37
|
params: true;
|
|
30
38
|
});
|
|
31
|
-
declare const createClient: <R extends Router | Router["endpoints"]>(options: ClientOptions) => <OPT extends (UnionToIntersection<
|
|
39
|
+
declare const createClient: <R extends Router | Router["endpoints"]>(options: ClientOptions) => <OPT extends (UnionToIntersection<InferClientRoutes<R extends {
|
|
32
40
|
endpoints: Record<string, Endpoint>;
|
|
33
41
|
} ? R["endpoints"] : R> extends {
|
|
34
42
|
[key: string]: infer T_1;
|
|
35
|
-
} ? T_1 extends Endpoint ? { [key in T_1["options"]["method"] extends "GET" ? T_1["path"] : `@${T_1["options"]["method"] extends string ? Lowercase<T_1["options"]["method"]> : never}${T_1["path"]}`]: T_1 } : {} : {}> extends infer T ? { [K_1 in keyof T]: UnionToIntersection<
|
|
43
|
+
} ? T_1 extends Endpoint ? { [key in T_1["options"]["method"] extends "GET" ? T_1["path"] : `@${T_1["options"]["method"] extends string ? Lowercase<T_1["options"]["method"]> : never}${T_1["path"]}`]: T_1 } : {} : {}> extends infer T ? { [K_1 in keyof T]: UnionToIntersection<InferClientRoutes<R extends {
|
|
36
44
|
endpoints: Record<string, Endpoint>;
|
|
37
45
|
} ? R["endpoints"] : R> extends {
|
|
38
46
|
[key: string]: infer T_1;
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","names":["options"],"sources":["../src/client.ts"],"sourcesContent":["import { type BetterFetchOption, type BetterFetchResponse, createFetch } from \"@better-fetch/fetch\";\nimport type { Router } from \"./router\";\nimport type { HasRequiredKeys, Prettify, UnionToIntersection } from \"./helper\";\nimport type { Endpoint } from \"./endpoint\";\n\ntype HasRequired<\n\tT extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = T[\"body\"] extends object\n\t? HasRequiredKeys<T[\"body\"]> extends true\n\t\t? true\n\t\t: T[\"query\"] extends object\n\t\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t\t? true\n\t\t\t\t: T[\"params\"] extends object\n\t\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t\t: false\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t: T[\"query\"] extends object\n\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t? true\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t\t: T[\"params\"] extends object\n\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t: false;\n\ntype InferContext<T> = T extends (ctx: infer Ctx) => any\n\t? Ctx extends object\n\t\t? Ctx\n\t\t: never\n\t: never;\n\nexport interface ClientOptions extends BetterFetchOption {\n\tbaseURL: string;\n}\n\ntype WithRequired<T, K> = T & {\n\t[P in K extends string ? K : never]-?: T[P extends keyof T ? P : never];\n};\n\ntype
|
|
1
|
+
{"version":3,"file":"client.js","names":["options"],"sources":["../src/client.ts"],"sourcesContent":["import { type BetterFetchOption, type BetterFetchResponse, createFetch } from \"@better-fetch/fetch\";\nimport type { Router } from \"./router\";\nimport type { HasRequiredKeys, Prettify, UnionToIntersection } from \"./helper\";\nimport type { Endpoint } from \"./endpoint\";\n\ntype HasRequired<\n\tT extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = T[\"body\"] extends object\n\t? HasRequiredKeys<T[\"body\"]> extends true\n\t\t? true\n\t\t: T[\"query\"] extends object\n\t\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t\t? true\n\t\t\t\t: T[\"params\"] extends object\n\t\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t\t: false\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t: T[\"query\"] extends object\n\t\t? HasRequiredKeys<T[\"query\"]> extends true\n\t\t\t? true\n\t\t\t: T[\"params\"] extends object\n\t\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t\t: false\n\t\t: T[\"params\"] extends object\n\t\t\t? HasRequiredKeys<T[\"params\"]>\n\t\t\t: false;\n\ntype InferContext<T> = T extends (ctx: infer Ctx) => any\n\t? Ctx extends object\n\t\t? Ctx\n\t\t: never\n\t: never;\n\nexport interface ClientOptions extends BetterFetchOption {\n\tbaseURL: string;\n}\n\ntype WithRequired<T, K> = T & {\n\t[P in K extends string ? K : never]-?: T[P extends keyof T ? P : never];\n};\n\ntype InferClientRoutes<T extends Record<string, Endpoint>> = {\n\t[K in keyof T]: T[K] extends Endpoint<any, infer O>\n\t\t? O extends\n\t\t\t\t| { metadata: { scope: \"http\" } }\n\t\t\t\t| { metadata: { scope: \"server\" } }\n\t\t\t\t| { metadata: { SERVER_ONLY: true } }\n\t\t\t? never\n\t\t\t: T[K]\n\t\t: T[K];\n};\n\nexport type RequiredOptionKeys<\n\tC extends {\n\t\tbody?: any;\n\t\tquery?: any;\n\t\tparams?: any;\n\t},\n> = (undefined extends C[\"body\"]\n\t? {}\n\t: {\n\t\t\tbody: true;\n\t\t}) &\n\t(undefined extends C[\"query\"]\n\t\t? {}\n\t\t: {\n\t\t\t\tquery: true;\n\t\t\t}) &\n\t(undefined extends C[\"params\"]\n\t\t? {}\n\t\t: {\n\t\t\t\tparams: true;\n\t\t\t});\n\nexport const createClient = <R extends Router | Router[\"endpoints\"]>(options: ClientOptions) => {\n\tconst fetch = createFetch(options);\n\ttype API = InferClientRoutes<\n\t\tR extends { endpoints: Record<string, Endpoint> } ? R[\"endpoints\"] : R\n\t>;\n\ttype Options = API extends {\n\t\t[key: string]: infer T;\n\t}\n\t\t? T extends Endpoint\n\t\t\t? {\n\t\t\t\t\t[key in T[\"options\"][\"method\"] extends \"GET\"\n\t\t\t\t\t\t? T[\"path\"]\n\t\t\t\t\t\t: `@${T[\"options\"][\"method\"] extends string ? Lowercase<T[\"options\"][\"method\"]> : never}${T[\"path\"]}`]: T;\n\t\t\t\t}\n\t\t\t: {}\n\t\t: {};\n\n\ttype O = Prettify<UnionToIntersection<Options>>;\n\treturn async <OPT extends O, K extends keyof OPT, C extends InferContext<OPT[K]>>(\n\t\tpath: K,\n\t\t...options: HasRequired<C> extends true\n\t\t\t? [\n\t\t\t\t\tWithRequired<\n\t\t\t\t\t\tBetterFetchOption<C[\"body\"], C[\"query\"], C[\"params\"]>,\n\t\t\t\t\t\tkeyof RequiredOptionKeys<C>\n\t\t\t\t\t>,\n\t\t\t\t]\n\t\t\t: [BetterFetchOption<C[\"body\"], C[\"query\"], C[\"params\"]>?]\n\t): Promise<\n\t\tBetterFetchResponse<Awaited<ReturnType<OPT[K] extends Endpoint ? OPT[K] : never>>>\n\t> => {\n\t\treturn (await fetch(path as string, {\n\t\t\t...options[0],\n\t\t})) as any;\n\t};\n};\n"],"mappings":";;;AAgFA,MAAa,gBAAwD,YAA2B;CAC/F,MAAM,QAAQ,YAAY,QAAQ;AAiBlC,QAAO,OACN,MACA,GAAGA,cAUC;AACJ,SAAQ,MAAM,MAAM,MAAgB,EACnC,GAAGA,UAAQ,IACX,CAAC"}
|
package/dist/index.cjs
CHANGED
|
@@ -136,10 +136,16 @@ async function getBody(request, allowedMediaTypes) {
|
|
|
136
136
|
const normalizedContentTypeBase = normalizedContentType.split(";")[0].trim();
|
|
137
137
|
const normalizedAllowed = allowed.toLowerCase().trim();
|
|
138
138
|
return normalizedContentTypeBase === normalizedAllowed || normalizedContentTypeBase.includes(normalizedAllowed);
|
|
139
|
-
}))
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
139
|
+
})) {
|
|
140
|
+
if (!normalizedContentType) throw new APIError(415, {
|
|
141
|
+
message: `Content-Type is required. Allowed types: ${allowedMediaTypes.join(", ")}`,
|
|
142
|
+
code: "UNSUPPORTED_MEDIA_TYPE"
|
|
143
|
+
});
|
|
144
|
+
throw new APIError(415, {
|
|
145
|
+
message: `Content-Type "${contentType}" is not allowed. Allowed types: ${allowedMediaTypes.join(", ")}`,
|
|
146
|
+
code: "UNSUPPORTED_MEDIA_TYPE"
|
|
147
|
+
});
|
|
148
|
+
}
|
|
143
149
|
}
|
|
144
150
|
if (normalizedContentType.includes("application/json")) return await request.json();
|
|
145
151
|
if (normalizedContentType.includes("application/x-www-form-urlencoded")) {
|
|
@@ -215,12 +221,14 @@ function toResponse(data, init) {
|
|
|
215
221
|
const body$1 = data.body;
|
|
216
222
|
const routerResponse = data.routerResponse;
|
|
217
223
|
if (routerResponse instanceof Response) return routerResponse;
|
|
218
|
-
const headers$1 = new Headers(
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
+
const headers$1 = new Headers();
|
|
225
|
+
if (routerResponse?.headers) {
|
|
226
|
+
const headers$2 = new Headers(routerResponse.headers);
|
|
227
|
+
for (const [key, value] of headers$2.entries()) headers$2.set(key, value);
|
|
228
|
+
}
|
|
229
|
+
if (data.headers) for (const [key, value] of new Headers(data.headers).entries()) headers$1.set(key, value);
|
|
230
|
+
if (init?.headers) for (const [key, value] of new Headers(init.headers).entries()) headers$1.set(key, value);
|
|
231
|
+
headers$1.set("Content-Type", "application/json");
|
|
224
232
|
return new Response(JSON.stringify(body$1), {
|
|
225
233
|
...routerResponse,
|
|
226
234
|
headers: headers$1,
|
|
@@ -441,7 +449,7 @@ const createInternalContext = async (context, { options, path }) => {
|
|
|
441
449
|
...context,
|
|
442
450
|
body: data.body,
|
|
443
451
|
query: data.query,
|
|
444
|
-
path: context.path || path,
|
|
452
|
+
path: context.path || path || "virtual:",
|
|
445
453
|
context: "context" in context && context.context ? context.context : {},
|
|
446
454
|
returned: void 0,
|
|
447
455
|
headers: context?.headers,
|
|
@@ -524,7 +532,10 @@ const createInternalContext = async (context, { options, path }) => {
|
|
|
524
532
|
|
|
525
533
|
//#endregion
|
|
526
534
|
//#region src/endpoint.ts
|
|
527
|
-
|
|
535
|
+
function createEndpoint(pathOrOptions, handlerOrOptions, handlerOrNever) {
|
|
536
|
+
const path = typeof pathOrOptions === "string" ? pathOrOptions : void 0;
|
|
537
|
+
const options = typeof handlerOrOptions === "object" ? handlerOrOptions : pathOrOptions;
|
|
538
|
+
const handler = typeof handlerOrOptions === "function" ? handlerOrOptions : handlerOrNever;
|
|
528
539
|
if ((options.method === "GET" || options.method === "HEAD") && options.body) throw new BetterCallError("Body is not allowed with GET or HEAD methods");
|
|
529
540
|
const internalHandler = async (...inputCtx) => {
|
|
530
541
|
const context = inputCtx[0] || {};
|
|
@@ -560,7 +571,7 @@ const createEndpoint = (path, options, handler) => {
|
|
|
560
571
|
internalHandler.options = options;
|
|
561
572
|
internalHandler.path = path;
|
|
562
573
|
return internalHandler;
|
|
563
|
-
}
|
|
574
|
+
}
|
|
564
575
|
createEndpoint.create = (opts) => {
|
|
565
576
|
return (path, options, handler) => {
|
|
566
577
|
return createEndpoint(path, {
|
|
@@ -2384,7 +2395,7 @@ async function generator(endpoints, config$1) {
|
|
|
2384
2395
|
const components = { schemas: {} };
|
|
2385
2396
|
Object.entries(endpoints).forEach(([_, value]) => {
|
|
2386
2397
|
const options = value.options;
|
|
2387
|
-
if (options.metadata?.SERVER_ONLY) return;
|
|
2398
|
+
if (!value.path || options.metadata?.SERVER_ONLY) return;
|
|
2388
2399
|
if (options.method === "GET") paths[value.path] = { get: {
|
|
2389
2400
|
tags: ["Default", ...options.metadata?.openapi?.tags || []],
|
|
2390
2401
|
description: options.metadata?.openapi?.description,
|
|
@@ -2473,7 +2484,7 @@ const createRouter = (endpoints, config$1) => {
|
|
|
2473
2484
|
const router = (0, rou3.createRouter)();
|
|
2474
2485
|
const middlewareRouter = (0, rou3.createRouter)();
|
|
2475
2486
|
for (const endpoint of Object.values(endpoints)) {
|
|
2476
|
-
if (!endpoint.options) continue;
|
|
2487
|
+
if (!endpoint.options || !endpoint.path) continue;
|
|
2477
2488
|
if (endpoint.options?.metadata?.SERVER_ONLY) continue;
|
|
2478
2489
|
const methods = Array.isArray(endpoint.options?.method) ? endpoint.options.method : [endpoint.options?.method];
|
|
2479
2490
|
for (const method of methods) (0, rou3.addRoute)(router, method, endpoint.path, endpoint);
|