@furystack/rest-client-fetch 7.0.5 → 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.
Files changed (6) hide show
  1. package/esm/create-client.d.ts +9 -0
  2. package/esm/create-client.d.ts.map +1 -1
  3. package/esm/create-client.js +27 -22
  4. package/esm/create-client.js.map +1 -1
  5. package/package.json +5 -5
  6. package/src/create-client.ts +37 -25
package/esm/create-client.d.ts CHANGED
@@ -35,9 +35,18 @@ export interface ClientOptions {
35
35
  requestInit?: RequestInit;
36
36
  serializeQueryParams?: (param: any) => string;
37
37
  }
38
+ export declare const defaultResponseParser: <T>(response: Response) => Promise<{
39
+ response: Response;
40
+ result: T;
41
+ }>;
42
+ export declare const compileRoute: <T extends Record<string, unknown>>(url: string, params: T) => string;
38
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: {
39
44
  method: TMethod;
40
45
  action: TAction;
46
+ responseParser?: (response: Response) => Promise<{
47
+ response: Response;
48
+ result: TReturns;
49
+ }>;
41
50
  } & TBodyType & TQuery & TUrlParams & THeaders) => Promise<{
42
51
  response: Response;
43
52
  result: TReturns;
package/esm/create-client.d.ts.map CHANGED
@@ -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,YAAY,qCAAsC,aAAa,mVAY/D;IACP,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;CAChB,GAAG,SAAS,GACX,MAAM,GACN,UAAU,GACV,QAAQ,KACT,QAAQ;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAA;CAAE,CA+CpD,CAAA"}
1
+ {"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"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"}
package/esm/create-client.js CHANGED
@@ -1,17 +1,40 @@
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
+ export const defaultResponseParser = async (response) => {
5
+ if (!response.ok) {
6
+ throw new ResponseError(response.statusText, response);
7
+ }
8
+ const contentType = response.headers?.get?.('Content-Type');
9
+ if (contentType?.startsWith('text/')) {
10
+ const result = (await response.text());
11
+ return { response, result };
12
+ }
13
+ if (contentType === 'form/multipart') {
14
+ const result = (await response.formData());
15
+ return { response, result };
16
+ }
17
+ try {
18
+ const result = (await response.json());
19
+ return { response, result };
20
+ }
21
+ catch (error) {
22
+ return { response, result: null };
23
+ }
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));
4
27
  export const createClient = (clientOptions) => {
5
28
  const fetchMethod = clientOptions.fetch || fetch;
6
29
  return async (options) => {
7
30
  const { url, query, body, headers } = options;
8
- const urlToSend = (url ? compile(options.action)(url) : options.action) +
31
+ const urlToSend = (url ? compileRoute(options.action, url) : options.action) +
9
32
  (query
10
33
  ? clientOptions.serializeQueryParams
11
34
  ? clientOptions.serializeQueryParams(query)
12
35
  : `?${serializeToQueryString(query)}`
13
36
  : '');
14
- const response = await fetchMethod((clientOptions.endpointUrl + urlToSend), {
37
+ const response = await fetchMethod(clientOptions.endpointUrl + urlToSend, {
15
38
  ...clientOptions.requestInit,
16
39
  method: options.method.toString(),
17
40
  body: body ? JSON.stringify(body) : undefined,
@@ -24,25 +47,7 @@ export const createClient = (clientOptions) => {
24
47
  }
25
48
  : {}),
26
49
  });
27
- if (!response.ok) {
28
- throw new ResponseError(response.statusText, response);
29
- }
30
- const contentType = response.headers?.get?.('Content-Type');
31
- if (contentType?.startsWith('text/')) {
32
- const result = (await response.text());
33
- return { response, result };
34
- }
35
- if (contentType === 'form/multipart') {
36
- const result = (await response.formData());
37
- return { response, result };
38
- }
39
- try {
40
- const result = (await response.json());
41
- return { response, result };
42
- }
43
- catch (error) {
44
- return { response, result: null };
45
- }
50
+ return (options.responseParser || defaultResponseParser)(response);
46
51
  };
47
52
  };
48
53
  //# sourceMappingURL=create-client.js.map
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,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAoBxC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAoB,aAA4B,EAAE,EAAE;IAC9E,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,IAAI,KAAK,CAAA;IAEhD,OAAO,KAAK,EASV,OAMU,EACyC,EAAE;QACrD,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAc,CAAA;QAEpD,MAAM,SAAS,GACb,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,OAAO,CAAC,MAAiB,CAAC;YAC3E,CAAC,KAAK;gBACJ,CAAC,CAAC,aAAa,CAAC,oBAAoB;oBAClC,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC;oBAC3C,CAAC,CAAC,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE;gBACvC,CAAC,CAAC,EAAE,CAAC,CAAA;QAET,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,CAAC,aAAa,CAAC,WAAW,GAAG,SAAS,CAAW,EAAE;YACpF,GAAG,aAAa,CAAC,WAAW;YAC5B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7C,GAAG,CAAC,OAAO;gBACT,CAAC,CAAC;oBACE,OAAO,EAAE;wBACP,GAAG,aAAa,CAAC,WAAW,EAAE,OAAO;wBACrC,GAAG,OAAO;qBACX;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,CAAA;QAE3D,IAAI,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAa,CAAA;YAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;QAC7B,CAAC;QAED,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAa,CAAA;YACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;QAC7B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAa,CAAA;YAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAgB,EAAE,CAAA;QAC/C,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}
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": "7.0.5",
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": "^7.0.5",
41
- "path-to-regexp": "^6.2.2"
40
+ "@furystack/rest": "^8.0.0",
41
+ "path-to-regexp": "^7.0.0"
42
42
  },
43
43
  "devDependencies": {
44
- "typescript": "^5.4.5",
45
- "vitest": "^1.6.0"
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
@@ -21,6 +21,37 @@ export interface ClientOptions {
21
21
  serializeQueryParams?: (param: any) => string
22
22
  }
23
23
 
24
+ export const defaultResponseParser = async <T>(response: Response): Promise<{ response: Response; result: T }> => {
25
+ if (!response.ok) {
26
+ throw new ResponseError(response.statusText, response)
27
+ }
28
+
29
+ const contentType = response.headers?.get?.('Content-Type')
30
+
31
+ if (contentType?.startsWith('text/')) {
32
+ const result = (await response.text()) as T
33
+ return { response, result }
34
+ }
35
+
36
+ if (contentType === 'form/multipart') {
37
+ const result = (await response.formData()) as T
38
+ return { response, result }
39
+ }
40
+
41
+ try {
42
+ const result = (await response.json()) as T
43
+ return { response, result }
44
+ } catch (error) {
45
+ return { response, result: null as T }
46
+ }
47
+ }
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
+
24
55
  export const createClient = <T extends RestApi>(clientOptions: ClientOptions) => {
25
56
  const fetchMethod = clientOptions.fetch || fetch
26
57
 
@@ -36,6 +67,7 @@ export const createClient = <T extends RestApi>(clientOptions: ClientOptions) =>
36
67
  options: {
37
68
  method: TMethod
38
69
  action: TAction
70
+ responseParser?: (response: Response) => Promise<{ response: Response; result: TReturns }>
39
71
  } & TBodyType &
40
72
  TQuery &
41
73
  TUrlParams &
@@ -44,14 +76,14 @@ export const createClient = <T extends RestApi>(clientOptions: ClientOptions) =>
44
76
  const { url, query, body, headers } = options as any
45
77
 
46
78
  const urlToSend =
47
- (url ? compile(options.action as string)(url) : (options.action as string)) +
79
+ (url ? compileRoute(options.action as string, url) : (options.action as string)) +
48
80
  (query
49
81
  ? clientOptions.serializeQueryParams
50
82
  ? clientOptions.serializeQueryParams(query)
51
83
  : `?${serializeToQueryString(query)}`
52
84
  : '')
53
85
 
54
- const response = await fetchMethod((clientOptions.endpointUrl + urlToSend) as string, {
86
+ const response = await fetchMethod(clientOptions.endpointUrl + urlToSend, {
55
87
  ...clientOptions.requestInit,
56
88
  method: options.method.toString(),
57
89
  body: body ? JSON.stringify(body) : undefined,
@@ -64,27 +96,7 @@ export const createClient = <T extends RestApi>(clientOptions: ClientOptions) =>
64
96
  }
65
97
  : {}),
66
98
  })
67
- if (!response.ok) {
68
- throw new ResponseError(response.statusText, response)
69
- }
70
-
71
- const contentType = response.headers?.get?.('Content-Type')
72
-
73
- if (contentType?.startsWith('text/')) {
74
- const result = (await response.text()) as TReturns
75
- return { response, result }
76
- }
77
-
78
- if (contentType === 'form/multipart') {
79
- const result = (await response.formData()) as TReturns
80
- return { response, result }
81
- }
82
-
83
- try {
84
- const result = (await response.json()) as TReturns
85
- return { response, result }
86
- } catch (error) {
87
- return { response, result: null as TReturns }
88
- }
99
+
100
+ return (options.responseParser || defaultResponseParser)(response)
89
101
  }
90
102
  }