@furystack/rest-client-fetch 7.1.0 → 8.0.0
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/esm/create-client.d.ts
CHANGED
|
@@ -39,6 +39,7 @@ export declare const defaultResponseParser: <T>(response: Response) => Promise<{
|
|
|
39
39
|
response: Response;
|
|
40
40
|
result: T;
|
|
41
41
|
}>;
|
|
42
|
+
export declare const compileRoute: <T extends Record<string, unknown>>(url: string, params: T) => string;
|
|
42
43
|
export declare const createClient: <T extends RestApi>(clientOptions: ClientOptions) => <TMethod extends keyof T, TAction extends keyof T[TMethod], TBodyType extends BodyParameter<T[TMethod][TAction]>, TQuery extends QueryParameter<T[TMethod][TAction]>, TUrlParams extends UrlParameter<T[TMethod][TAction]>, TReturns extends ReturnType<T[TMethod][TAction]>, THeaders extends HeaderParameter<T[TMethod][TAction]>>(options: {
|
|
43
44
|
method: TMethod;
|
|
44
45
|
action: TAction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAI9C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEnG,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEtG,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEhG,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAE3G,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAA;AAEzE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,OAAO,CAAA;CAAE,GAAG,OAAO,GAAG,KAAK,CAAA;AAEjF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IACpB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAAA;CAC9C;AAED,eAAO,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAI9C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEnG,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEtG,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAEhG,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,CAAC,CAAA;CAAE,GAAG,OAAO,CAAA;AAE3G,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAA;AAEzE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,OAAO,CAAA;CAAE,GAAG,OAAO,GAAG,KAAK,CAAA;AAEjF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IACpB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAAA;CAC9C;AAED,eAAO,MAAM,qBAAqB,GAAU,CAAC,YAAY,QAAQ,KAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,CAuB5G,CAAA;AAKD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,MAAM,UAAU,CAAC,WACzC,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,OAAO,iBAAiB,aAAa,MAIxE,OAAO,SAAS,MAAM,CAAC,EACvB,OAAO,SAAS,MAAM,CAAC,CAAC,OAAO,CAAC,EAChC,SAAS,SAAS,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EACpD,MAAM,SAAS,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EAClD,UAAU,SAAS,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EACpD,QAAQ,SAAS,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EAChD,QAAQ,SAAS,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAE5C;IACP,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAA;CAC3F,GAAG,SAAS,GACX,MAAM,GACN,UAAU,GACV,QAAQ,KACT,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAA;CAAE,CA2BpD,CAAA"}
|
package/esm/create-client.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { serializeToQueryString } from '@furystack/rest';
|
|
2
|
-
import { ResponseError } from './response-error.js';
|
|
3
2
|
import { compile } from 'path-to-regexp';
|
|
3
|
+
import { ResponseError } from './response-error.js';
|
|
4
4
|
export const defaultResponseParser = async (response) => {
|
|
5
5
|
if (!response.ok) {
|
|
6
6
|
throw new ResponseError(response.statusText, response);
|
|
@@ -22,17 +22,19 @@ export const defaultResponseParser = async (response) => {
|
|
|
22
22
|
return { response, result: null };
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
|
+
const stringifyObjectValues = (params) => Object.fromEntries(Object.entries(params).map(([key, value]) => [key, value?.toString()]));
|
|
26
|
+
export const compileRoute = (url, params) => compile(url)(stringifyObjectValues(params));
|
|
25
27
|
export const createClient = (clientOptions) => {
|
|
26
28
|
const fetchMethod = clientOptions.fetch || fetch;
|
|
27
29
|
return async (options) => {
|
|
28
30
|
const { url, query, body, headers } = options;
|
|
29
|
-
const urlToSend = (url ?
|
|
31
|
+
const urlToSend = (url ? compileRoute(options.action, url) : options.action) +
|
|
30
32
|
(query
|
|
31
33
|
? clientOptions.serializeQueryParams
|
|
32
34
|
? clientOptions.serializeQueryParams(query)
|
|
33
35
|
: `?${serializeToQueryString(query)}`
|
|
34
36
|
: '');
|
|
35
|
-
const response = await fetchMethod(
|
|
37
|
+
const response = await fetchMethod(clientOptions.endpointUrl + urlToSend, {
|
|
36
38
|
...clientOptions.requestInit,
|
|
37
39
|
method: options.method.toString(),
|
|
38
40
|
body: body ? JSON.stringify(body) : undefined,
|
package/esm/create-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/rest-client-fetch",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"description": "Native browser fetch based REST API implementation for FuryStack",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
},
|
|
38
38
|
"homepage": "https://github.com/furystack/furystack",
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@furystack/rest": "^
|
|
41
|
-
"path-to-regexp": "^
|
|
40
|
+
"@furystack/rest": "^8.0.0",
|
|
41
|
+
"path-to-regexp": "^7.0.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"typescript": "^5.
|
|
45
|
-
"vitest": "^
|
|
44
|
+
"typescript": "^5.5.3",
|
|
45
|
+
"vitest": "^2.0.0"
|
|
46
46
|
},
|
|
47
47
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
|
48
48
|
}
|
package/src/create-client.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RestApi } from '@furystack/rest'
|
|
2
2
|
import { serializeToQueryString } from '@furystack/rest'
|
|
3
|
-
import { ResponseError } from './response-error.js'
|
|
4
3
|
import { compile } from 'path-to-regexp'
|
|
4
|
+
import { ResponseError } from './response-error.js'
|
|
5
5
|
export type BodyParameter<T> = T extends { result: unknown; body: infer U } ? { body: U } : unknown
|
|
6
6
|
|
|
7
7
|
export type QueryParameter<T> = T extends { result: unknown; query: infer U } ? { query: U } : unknown
|
|
@@ -46,6 +46,12 @@ export const defaultResponseParser = async <T>(response: Response): Promise<{ re
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
+
const stringifyObjectValues = (params: Record<string, unknown>) =>
|
|
50
|
+
Object.fromEntries(Object.entries(params).map(([key, value]) => [key, value?.toString()]))
|
|
51
|
+
|
|
52
|
+
export const compileRoute = <T extends Record<string, unknown>>(url: string, params: T) =>
|
|
53
|
+
compile(url)(stringifyObjectValues(params))
|
|
54
|
+
|
|
49
55
|
export const createClient = <T extends RestApi>(clientOptions: ClientOptions) => {
|
|
50
56
|
const fetchMethod = clientOptions.fetch || fetch
|
|
51
57
|
|
|
@@ -70,14 +76,14 @@ export const createClient = <T extends RestApi>(clientOptions: ClientOptions) =>
|
|
|
70
76
|
const { url, query, body, headers } = options as any
|
|
71
77
|
|
|
72
78
|
const urlToSend =
|
|
73
|
-
(url ?
|
|
79
|
+
(url ? compileRoute(options.action as string, url) : (options.action as string)) +
|
|
74
80
|
(query
|
|
75
81
|
? clientOptions.serializeQueryParams
|
|
76
82
|
? clientOptions.serializeQueryParams(query)
|
|
77
83
|
: `?${serializeToQueryString(query)}`
|
|
78
84
|
: '')
|
|
79
85
|
|
|
80
|
-
const response = await fetchMethod(
|
|
86
|
+
const response = await fetchMethod(clientOptions.endpointUrl + urlToSend, {
|
|
81
87
|
...clientOptions.requestInit,
|
|
82
88
|
method: options.method.toString(),
|
|
83
89
|
body: body ? JSON.stringify(body) : undefined,
|