@readyfor/api-client-base 0.242.1 → 0.243.0-pr981.52c46aa

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 (48) hide show
  1. package/dist/apiClientConfigStore.d.mts +2 -1
  2. package/dist/apiClientConfigStore.d.ts +2 -1
  3. package/dist/apiClientConfigStore.js +30 -0
  4. package/dist/apiClientConfigStore.mjs +6 -1
  5. package/dist/apiError.mjs +1 -0
  6. package/dist/chunk-7P6ASYW6.mjs +9 -0
  7. package/dist/{chunk-RGDL3AEX.mjs → chunk-BIWBZZRT.mjs} +1 -1
  8. package/dist/{chunk-5ZI7SAUQ.mjs → chunk-D6TR6JPT.mjs} +1 -1
  9. package/dist/chunk-DATABM5C.mjs +21 -0
  10. package/dist/chunk-DLVEXL2J.mjs +37 -0
  11. package/dist/{chunk-BNXKKSJH.mjs → chunk-IF7WWYV5.mjs} +32 -41
  12. package/dist/chunk-LYXJUKKR.mjs +14 -0
  13. package/dist/chunk-SMMDKVWH.mjs +29 -0
  14. package/dist/fetcher.js +52 -40
  15. package/dist/fetcher.mjs +5 -2
  16. package/dist/index.d.mts +2 -1
  17. package/dist/index.d.ts +2 -1
  18. package/dist/index.js +60 -40
  19. package/dist/index.mjs +11 -3
  20. package/dist/react/ApiClientConfigProvider.mjs +5 -2
  21. package/dist/react/index.js +26 -30
  22. package/dist/react/index.mjs +6 -3
  23. package/dist/react/swr.mjs +1 -0
  24. package/dist/react/useApiClientConfig.js +26 -30
  25. package/dist/react/useApiClientConfig.mjs +6 -3
  26. package/dist/requestUrl.mjs +5 -2
  27. package/dist/requestUrl.test.mjs +5 -2
  28. package/dist/store.mjs +1 -0
  29. package/dist/utils/headersInit.d.mts +17 -0
  30. package/dist/utils/headersInit.d.ts +17 -0
  31. package/dist/utils/headersInit.js +44 -0
  32. package/dist/utils/headersInit.mjs +7 -0
  33. package/dist/utils/headersInit.test.d.mts +2 -0
  34. package/dist/utils/headersInit.test.d.ts +2 -0
  35. package/dist/utils/headersInit.test.js +81 -0
  36. package/dist/utils/headersInit.test.mjs +67 -0
  37. package/dist/utils/requestInit.d.mts +9 -0
  38. package/dist/utils/requestInit.d.ts +9 -0
  39. package/dist/utils/requestInit.js +53 -0
  40. package/dist/utils/requestInit.mjs +8 -0
  41. package/dist/utils/requestInit.test.d.mts +2 -0
  42. package/dist/utils/requestInit.test.d.ts +2 -0
  43. package/dist/utils/requestInit.test.js +133 -0
  44. package/dist/utils/requestInit.test.mjs +106 -0
  45. package/dist/zod.mjs +1 -0
  46. package/package.json +8 -9
  47. package/dist/chunk-472P3XVV.mjs +0 -13
  48. package/dist/chunk-JOSDYCJN.mjs +0 -62
package/dist/index.mjs CHANGED
@@ -3,7 +3,7 @@ import {
3
3
  createJsonFetcher,
4
4
  createTextFetcher,
5
5
  createVoidFetcher
6
- } from "./chunk-BNXKKSJH.mjs";
6
+ } from "./chunk-IF7WWYV5.mjs";
7
7
  import {
8
8
  HTTPError,
9
9
  errorStatusCode,
@@ -16,18 +16,25 @@ import {
16
16
  } from "./chunk-JCZWXJBU.mjs";
17
17
  import {
18
18
  __internal__requestUrl
19
- } from "./chunk-RGDL3AEX.mjs";
19
+ } from "./chunk-BIWBZZRT.mjs";
20
20
  import {
21
+ buildRequestInitWithDefaultConfig,
21
22
  setApiClientConfig,
22
23
  store
23
- } from "./chunk-472P3XVV.mjs";
24
+ } from "./chunk-DATABM5C.mjs";
25
+ import {
26
+ mergeRequestInit
27
+ } from "./chunk-LYXJUKKR.mjs";
28
+ import "./chunk-SMMDKVWH.mjs";
24
29
  import {
25
30
  createStore
26
31
  } from "./chunk-3SEO7S3Q.mjs";
32
+ import "./chunk-7P6ASYW6.mjs";
27
33
  import "./chunk-WBQAMGXK.mjs";
28
34
  export {
29
35
  HTTPError,
30
36
  __internal__requestUrl,
37
+ buildRequestInitWithDefaultConfig,
31
38
  createBlobFetcher,
32
39
  createJsonFetcher,
33
40
  createStore,
@@ -37,6 +44,7 @@ export {
37
44
  errorTitle,
38
45
  getErrorStatus,
39
46
  isZodError,
47
+ mergeRequestInit,
40
48
  schemaForType,
41
49
  setApiClientConfig,
42
50
  store
@@ -1,10 +1,13 @@
1
1
  import {
2
2
  ApiClientConfigProvider,
3
3
  useApiClientConfigContext
4
- } from "../chunk-5ZI7SAUQ.mjs";
4
+ } from "../chunk-D6TR6JPT.mjs";
5
5
  import "../chunk-DH33ZDBG.mjs";
6
- import "../chunk-472P3XVV.mjs";
6
+ import "../chunk-DATABM5C.mjs";
7
+ import "../chunk-LYXJUKKR.mjs";
8
+ import "../chunk-SMMDKVWH.mjs";
7
9
  import "../chunk-3SEO7S3Q.mjs";
10
+ import "../chunk-7P6ASYW6.mjs";
8
11
  export {
9
12
  ApiClientConfigProvider,
10
13
  useApiClientConfigContext
@@ -52,6 +52,30 @@ var createStore = (initialState) => {
52
52
  };
53
53
  };
54
54
 
55
+ // src/utils/headersInit.ts
56
+ var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
57
+ const base = new Headers(baseHeadersInit);
58
+ const override = new Headers(overrideHeadersInit);
59
+ const setCookies = base.getSetCookie().concat(override.getSetCookie());
60
+ base.delete("set-cookie");
61
+ override.delete("set-cookie");
62
+ const mergedHeaders = new Headers({
63
+ ...Object.fromEntries(base),
64
+ ...Object.fromEntries(override)
65
+ });
66
+ setCookies.forEach((cookie) => {
67
+ mergedHeaders.append("set-cookie", cookie);
68
+ });
69
+ return mergedHeaders;
70
+ };
71
+
72
+ // src/utils/requestInit.ts
73
+ var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
74
+ ...base,
75
+ ...override,
76
+ headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
77
+ });
78
+
55
79
  // src/apiClientConfigStore.ts
56
80
  var defaultConfig = {};
57
81
  var store = createStore(defaultConfig);
@@ -106,37 +130,9 @@ var useApiClientConfigWithSelector = (selector) => {
106
130
  };
107
131
  var useRequestInit = (customRequestInit = {}) => {
108
132
  const { defaultRequestInit = {} } = useApiClientConfig();
109
- const keys = (0, import_react3.useMemo)(
110
- () => Object.keys({
111
- ...defaultRequestInit,
112
- ...customRequestInit
113
- }),
114
- [defaultRequestInit, customRequestInit]
115
- );
116
- const get = (0, import_react3.useCallback)((key) => {
117
- if (customRequestInit[key] === void 0) {
118
- return defaultRequestInit[key];
119
- }
120
- if (defaultRequestInit[key] === void 0) {
121
- return customRequestInit[key];
122
- }
123
- if (typeof customRequestInit[key] === "object" && typeof defaultRequestInit[key] === "object") {
124
- return { ...defaultRequestInit[key], ...customRequestInit[key] };
125
- }
126
- if (Array.isArray(customRequestInit[key]) && Array.isArray(defaultRequestInit[key])) {
127
- return [...defaultRequestInit[key], ...customRequestInit[key]];
128
- }
129
- return customRequestInit[key] ?? defaultRequestInit[key];
130
- }, []);
131
133
  return (0, import_react3.useMemo)(
132
- () => keys.reduce(
133
- (acc, key) => ({
134
- ...acc,
135
- [key]: get(key)
136
- }),
137
- {}
138
- ),
139
- [keys, get]
134
+ () => mergeRequestInit(defaultRequestInit, customRequestInit),
135
+ [defaultRequestInit, customRequestInit]
140
136
  );
141
137
  };
142
138
  // Annotate the CommonJS export names for ESM import in node:
@@ -2,16 +2,19 @@ import {
2
2
  useApiClientConfig,
3
3
  useApiClientConfigWithSelector,
4
4
  useRequestInit
5
- } from "../chunk-JOSDYCJN.mjs";
5
+ } from "../chunk-DLVEXL2J.mjs";
6
6
  import {
7
7
  ApiClientConfigProvider,
8
8
  useApiClientConfigContext
9
- } from "../chunk-5ZI7SAUQ.mjs";
9
+ } from "../chunk-D6TR6JPT.mjs";
10
10
  import {
11
11
  createSwrConfig
12
12
  } from "../chunk-DH33ZDBG.mjs";
13
- import "../chunk-472P3XVV.mjs";
13
+ import "../chunk-DATABM5C.mjs";
14
+ import "../chunk-LYXJUKKR.mjs";
15
+ import "../chunk-SMMDKVWH.mjs";
14
16
  import "../chunk-3SEO7S3Q.mjs";
17
+ import "../chunk-7P6ASYW6.mjs";
15
18
  export {
16
19
  ApiClientConfigProvider,
17
20
  createSwrConfig,
@@ -1,6 +1,7 @@
1
1
  import {
2
2
  createSwrConfig
3
3
  } from "../chunk-DH33ZDBG.mjs";
4
+ import "../chunk-7P6ASYW6.mjs";
4
5
  export {
5
6
  createSwrConfig
6
7
  };
@@ -49,6 +49,30 @@ var createStore = (initialState) => {
49
49
  };
50
50
  };
51
51
 
52
+ // src/utils/headersInit.ts
53
+ var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
54
+ const base = new Headers(baseHeadersInit);
55
+ const override = new Headers(overrideHeadersInit);
56
+ const setCookies = base.getSetCookie().concat(override.getSetCookie());
57
+ base.delete("set-cookie");
58
+ override.delete("set-cookie");
59
+ const mergedHeaders = new Headers({
60
+ ...Object.fromEntries(base),
61
+ ...Object.fromEntries(override)
62
+ });
63
+ setCookies.forEach((cookie) => {
64
+ mergedHeaders.append("set-cookie", cookie);
65
+ });
66
+ return mergedHeaders;
67
+ };
68
+
69
+ // src/utils/requestInit.ts
70
+ var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
71
+ ...base,
72
+ ...override,
73
+ headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
74
+ });
75
+
52
76
  // src/apiClientConfigStore.ts
53
77
  var defaultConfig = {};
54
78
  var store = createStore(defaultConfig);
@@ -83,37 +107,9 @@ var useApiClientConfigWithSelector = (selector) => {
83
107
  };
84
108
  var useRequestInit = (customRequestInit = {}) => {
85
109
  const { defaultRequestInit = {} } = useApiClientConfig();
86
- const keys = (0, import_react3.useMemo)(
87
- () => Object.keys({
88
- ...defaultRequestInit,
89
- ...customRequestInit
90
- }),
91
- [defaultRequestInit, customRequestInit]
92
- );
93
- const get = (0, import_react3.useCallback)((key) => {
94
- if (customRequestInit[key] === void 0) {
95
- return defaultRequestInit[key];
96
- }
97
- if (defaultRequestInit[key] === void 0) {
98
- return customRequestInit[key];
99
- }
100
- if (typeof customRequestInit[key] === "object" && typeof defaultRequestInit[key] === "object") {
101
- return { ...defaultRequestInit[key], ...customRequestInit[key] };
102
- }
103
- if (Array.isArray(customRequestInit[key]) && Array.isArray(defaultRequestInit[key])) {
104
- return [...defaultRequestInit[key], ...customRequestInit[key]];
105
- }
106
- return customRequestInit[key] ?? defaultRequestInit[key];
107
- }, []);
108
110
  return (0, import_react3.useMemo)(
109
- () => keys.reduce(
110
- (acc, key) => ({
111
- ...acc,
112
- [key]: get(key)
113
- }),
114
- {}
115
- ),
116
- [keys, get]
111
+ () => mergeRequestInit(defaultRequestInit, customRequestInit),
112
+ [defaultRequestInit, customRequestInit]
117
113
  );
118
114
  };
119
115
  // Annotate the CommonJS export names for ESM import in node:
@@ -2,11 +2,14 @@ import {
2
2
  useApiClientConfig,
3
3
  useApiClientConfigWithSelector,
4
4
  useRequestInit
5
- } from "../chunk-JOSDYCJN.mjs";
6
- import "../chunk-5ZI7SAUQ.mjs";
5
+ } from "../chunk-DLVEXL2J.mjs";
6
+ import "../chunk-D6TR6JPT.mjs";
7
7
  import "../chunk-DH33ZDBG.mjs";
8
- import "../chunk-472P3XVV.mjs";
8
+ import "../chunk-DATABM5C.mjs";
9
+ import "../chunk-LYXJUKKR.mjs";
10
+ import "../chunk-SMMDKVWH.mjs";
9
11
  import "../chunk-3SEO7S3Q.mjs";
12
+ import "../chunk-7P6ASYW6.mjs";
10
13
  export {
11
14
  useApiClientConfig,
12
15
  useApiClientConfigWithSelector,
@@ -1,8 +1,11 @@
1
1
  import {
2
2
  __internal__requestUrl
3
- } from "./chunk-RGDL3AEX.mjs";
4
- import "./chunk-472P3XVV.mjs";
3
+ } from "./chunk-BIWBZZRT.mjs";
4
+ import "./chunk-DATABM5C.mjs";
5
+ import "./chunk-LYXJUKKR.mjs";
6
+ import "./chunk-SMMDKVWH.mjs";
5
7
  import "./chunk-3SEO7S3Q.mjs";
8
+ import "./chunk-7P6ASYW6.mjs";
6
9
  export {
7
10
  __internal__requestUrl
8
11
  };
@@ -1,10 +1,13 @@
1
1
  import {
2
2
  __internal__requestUrl
3
- } from "./chunk-RGDL3AEX.mjs";
3
+ } from "./chunk-BIWBZZRT.mjs";
4
4
  import {
5
5
  store
6
- } from "./chunk-472P3XVV.mjs";
6
+ } from "./chunk-DATABM5C.mjs";
7
+ import "./chunk-LYXJUKKR.mjs";
8
+ import "./chunk-SMMDKVWH.mjs";
7
9
  import "./chunk-3SEO7S3Q.mjs";
10
+ import "./chunk-7P6ASYW6.mjs";
8
11
 
9
12
  // src/requestUrl.test.ts
10
13
  var config = {
package/dist/store.mjs CHANGED
@@ -1,6 +1,7 @@
1
1
  import {
2
2
  createStore
3
3
  } from "./chunk-3SEO7S3Q.mjs";
4
+ import "./chunk-7P6ASYW6.mjs";
4
5
  export {
5
6
  createStore
6
7
  };
@@ -0,0 +1,17 @@
1
+ /**
2
+ * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
3
+ *
4
+ * Set-Cookieヘッダーは両方のHeadersInitから取得し、マージ後のHeadersに追加される。
5
+ * それ以外のヘッダーは、後勝ちの形式で新たなHeadersInitにマージされる。
6
+ *
7
+ * ヘッダーを削除する仕組みなどは非対応。
8
+ *
9
+ * Set-Cookieを特別扱いするのは、Fetch APIの仕様に基づいている。
10
+ * https://fetch.spec.whatwg.org/#terminology-headers
11
+ *
12
+ * @param baseHeadersInit 元となるHeadersInit
13
+ * @param overrideHeadersInit 上書きしたいヘッダーを含むHeadersInit。
14
+ */
15
+ declare const mergeHeadersInit: (baseHeadersInit: HeadersInit, overrideHeadersInit: HeadersInit) => HeadersInit;
16
+
17
+ export { mergeHeadersInit };
@@ -0,0 +1,17 @@
1
+ /**
2
+ * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
3
+ *
4
+ * Set-Cookieヘッダーは両方のHeadersInitから取得し、マージ後のHeadersに追加される。
5
+ * それ以外のヘッダーは、後勝ちの形式で新たなHeadersInitにマージされる。
6
+ *
7
+ * ヘッダーを削除する仕組みなどは非対応。
8
+ *
9
+ * Set-Cookieを特別扱いするのは、Fetch APIの仕様に基づいている。
10
+ * https://fetch.spec.whatwg.org/#terminology-headers
11
+ *
12
+ * @param baseHeadersInit 元となるHeadersInit
13
+ * @param overrideHeadersInit 上書きしたいヘッダーを含むHeadersInit。
14
+ */
15
+ declare const mergeHeadersInit: (baseHeadersInit: HeadersInit, overrideHeadersInit: HeadersInit) => HeadersInit;
16
+
17
+ export { mergeHeadersInit };
@@ -0,0 +1,44 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+
20
+ // src/utils/headersInit.ts
21
+ var headersInit_exports = {};
22
+ __export(headersInit_exports, {
23
+ mergeHeadersInit: () => mergeHeadersInit
24
+ });
25
+ module.exports = __toCommonJS(headersInit_exports);
26
+ var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
27
+ const base = new Headers(baseHeadersInit);
28
+ const override = new Headers(overrideHeadersInit);
29
+ const setCookies = base.getSetCookie().concat(override.getSetCookie());
30
+ base.delete("set-cookie");
31
+ override.delete("set-cookie");
32
+ const mergedHeaders = new Headers({
33
+ ...Object.fromEntries(base),
34
+ ...Object.fromEntries(override)
35
+ });
36
+ setCookies.forEach((cookie) => {
37
+ mergedHeaders.append("set-cookie", cookie);
38
+ });
39
+ return mergedHeaders;
40
+ };
41
+ // Annotate the CommonJS export names for ESM import in node:
42
+ 0 && (module.exports = {
43
+ mergeHeadersInit
44
+ });
@@ -0,0 +1,7 @@
1
+ import {
2
+ mergeHeadersInit
3
+ } from "../chunk-SMMDKVWH.mjs";
4
+ import "../chunk-7P6ASYW6.mjs";
5
+ export {
6
+ mergeHeadersInit
7
+ };
@@ -0,0 +1,2 @@
1
+
2
+ export { }
@@ -0,0 +1,2 @@
1
+
2
+ export { }
@@ -0,0 +1,81 @@
1
+ "use strict";
2
+
3
+ // src/utils/headersInit.ts
4
+ var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
5
+ const base = new Headers(baseHeadersInit);
6
+ const override = new Headers(overrideHeadersInit);
7
+ const setCookies = base.getSetCookie().concat(override.getSetCookie());
8
+ base.delete("set-cookie");
9
+ override.delete("set-cookie");
10
+ const mergedHeaders = new Headers({
11
+ ...Object.fromEntries(base),
12
+ ...Object.fromEntries(override)
13
+ });
14
+ setCookies.forEach((cookie) => {
15
+ mergedHeaders.append("set-cookie", cookie);
16
+ });
17
+ return mergedHeaders;
18
+ };
19
+
20
+ // src/utils/headersInit.test.ts
21
+ describe("mergeHeadersInit", () => {
22
+ test("Set-Cookie\u4EE5\u5916\u306E\u30D8\u30C3\u30C0\u30FC\u306F\u5F15\u6570\u3067\u4E0A\u66F8\u304D\u3055\u308C\u3001Set-Cookie\u30D8\u30C3\u30C0\u30FC\u306F\u4E21\u65B9\u306E\u3082\u306E\u3092\u7D50\u5408\u3059\u308B", () => {
23
+ const base = {
24
+ "Content-Type": "application/json",
25
+ Authorization: "Basic token",
26
+ "Set-Cookie": "base=value",
27
+ "X-Test": "base value"
28
+ };
29
+ const override = {
30
+ Authorization: "Bearer token",
31
+ "X-Test": "override value",
32
+ "Set-Cookie": "override=value"
33
+ };
34
+ const result = new Headers(mergeHeadersInit(base, override));
35
+ expect([...result]).toEqual([
36
+ ["authorization", "Bearer token"],
37
+ ["content-type", "application/json"],
38
+ ["set-cookie", "base=value"],
39
+ ["set-cookie", "override=value"],
40
+ ["x-test", "override value"]
41
+ ]);
42
+ });
43
+ describe("\u5185\u90E8\u3067\u5229\u7528\u3057\u3066\u3044\u308BHeaders\u306E\u56DE\u5E30\u30C6\u30B9\u30C8", () => {
44
+ test("Set-Cookie\u30D8\u30C3\u30C0\u30FC\u306F\u30AB\u30F3\u30DE\u3067\u7D50\u5408\u3055\u308C\u305A\u3001\u305D\u308C\u4EE5\u5916\u306E\u30D8\u30C3\u30C0\u30FC\u306F\u30AB\u30F3\u30DE\u3067\u7D50\u5408\u3055\u308C\u308B", () => {
45
+ expect([
46
+ ...new Headers([
47
+ ["X-Test", "test1"],
48
+ ["X-Test", "test2"],
49
+ ["X-Test", "test3"],
50
+ ["Accept", "text/html"],
51
+ ["Accept", "application/json"],
52
+ ["Accept", "application/xml"],
53
+ ["Set-Cookie", "a=1"],
54
+ ["Set-Cookie", "b=2"],
55
+ ["Set-Cookie", "c=3"]
56
+ ])
57
+ ]).toEqual([
58
+ ["accept", "text/html, application/json, application/xml"],
59
+ ["set-cookie", "a=1"],
60
+ ["set-cookie", "b=2"],
61
+ ["set-cookie", "c=3"],
62
+ ["x-test", "test1, test2, test3"]
63
+ ]);
64
+ });
65
+ test("\u30D8\u30C3\u30C0\u30FC\u306F\u5C0F\u6587\u5B57\u306B\u6B63\u898F\u5316\u3055\u308C\u308B", () => {
66
+ expect([
67
+ ...new Headers([
68
+ ["ACCEPT", "text/html"],
69
+ ["accept", "application/json"],
70
+ ["Set-Cookie", "a=1"],
71
+ ["aCcePT", "application/xml"],
72
+ ["set-cookie", "b=2"]
73
+ ])
74
+ ]).toEqual([
75
+ ["accept", "text/html, application/json, application/xml"],
76
+ ["set-cookie", "a=1"],
77
+ ["set-cookie", "b=2"]
78
+ ]);
79
+ });
80
+ });
81
+ });
@@ -0,0 +1,67 @@
1
+ import {
2
+ mergeHeadersInit
3
+ } from "../chunk-SMMDKVWH.mjs";
4
+ import "../chunk-7P6ASYW6.mjs";
5
+
6
+ // src/utils/headersInit.test.ts
7
+ describe("mergeHeadersInit", () => {
8
+ test("Set-Cookie\u4EE5\u5916\u306E\u30D8\u30C3\u30C0\u30FC\u306F\u5F15\u6570\u3067\u4E0A\u66F8\u304D\u3055\u308C\u3001Set-Cookie\u30D8\u30C3\u30C0\u30FC\u306F\u4E21\u65B9\u306E\u3082\u306E\u3092\u7D50\u5408\u3059\u308B", () => {
9
+ const base = {
10
+ "Content-Type": "application/json",
11
+ Authorization: "Basic token",
12
+ "Set-Cookie": "base=value",
13
+ "X-Test": "base value"
14
+ };
15
+ const override = {
16
+ Authorization: "Bearer token",
17
+ "X-Test": "override value",
18
+ "Set-Cookie": "override=value"
19
+ };
20
+ const result = new Headers(mergeHeadersInit(base, override));
21
+ expect([...result]).toEqual([
22
+ ["authorization", "Bearer token"],
23
+ ["content-type", "application/json"],
24
+ ["set-cookie", "base=value"],
25
+ ["set-cookie", "override=value"],
26
+ ["x-test", "override value"]
27
+ ]);
28
+ });
29
+ describe("\u5185\u90E8\u3067\u5229\u7528\u3057\u3066\u3044\u308BHeaders\u306E\u56DE\u5E30\u30C6\u30B9\u30C8", () => {
30
+ test("Set-Cookie\u30D8\u30C3\u30C0\u30FC\u306F\u30AB\u30F3\u30DE\u3067\u7D50\u5408\u3055\u308C\u305A\u3001\u305D\u308C\u4EE5\u5916\u306E\u30D8\u30C3\u30C0\u30FC\u306F\u30AB\u30F3\u30DE\u3067\u7D50\u5408\u3055\u308C\u308B", () => {
31
+ expect([
32
+ ...new Headers([
33
+ ["X-Test", "test1"],
34
+ ["X-Test", "test2"],
35
+ ["X-Test", "test3"],
36
+ ["Accept", "text/html"],
37
+ ["Accept", "application/json"],
38
+ ["Accept", "application/xml"],
39
+ ["Set-Cookie", "a=1"],
40
+ ["Set-Cookie", "b=2"],
41
+ ["Set-Cookie", "c=3"]
42
+ ])
43
+ ]).toEqual([
44
+ ["accept", "text/html, application/json, application/xml"],
45
+ ["set-cookie", "a=1"],
46
+ ["set-cookie", "b=2"],
47
+ ["set-cookie", "c=3"],
48
+ ["x-test", "test1, test2, test3"]
49
+ ]);
50
+ });
51
+ test("\u30D8\u30C3\u30C0\u30FC\u306F\u5C0F\u6587\u5B57\u306B\u6B63\u898F\u5316\u3055\u308C\u308B", () => {
52
+ expect([
53
+ ...new Headers([
54
+ ["ACCEPT", "text/html"],
55
+ ["accept", "application/json"],
56
+ ["Set-Cookie", "a=1"],
57
+ ["aCcePT", "application/xml"],
58
+ ["set-cookie", "b=2"]
59
+ ])
60
+ ]).toEqual([
61
+ ["accept", "text/html, application/json, application/xml"],
62
+ ["set-cookie", "a=1"],
63
+ ["set-cookie", "b=2"]
64
+ ]);
65
+ });
66
+ });
67
+ });
@@ -0,0 +1,9 @@
1
+ /**
2
+ * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
3
+ * 同じフィールドが存在する場合、第二引数の値で上書きされる。
4
+ * ただし、`headers`フィールドに関しては、`base`と`override`両方に有効なHeadersInitがある場合に限り、
5
+ * `mergeHeadersInit`を使用してヘッダーの内容をマージする
6
+ */
7
+ declare const mergeRequestInit: ({ headers: baseHeaders, ...base }: RequestInit, { headers: overrideHeaders, ...override }: RequestInit) => RequestInit;
8
+
9
+ export { mergeRequestInit };
@@ -0,0 +1,9 @@
1
+ /**
2
+ * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
3
+ * 同じフィールドが存在する場合、第二引数の値で上書きされる。
4
+ * ただし、`headers`フィールドに関しては、`base`と`override`両方に有効なHeadersInitがある場合に限り、
5
+ * `mergeHeadersInit`を使用してヘッダーの内容をマージする
6
+ */
7
+ declare const mergeRequestInit: ({ headers: baseHeaders, ...base }: RequestInit, { headers: overrideHeaders, ...override }: RequestInit) => RequestInit;
8
+
9
+ export { mergeRequestInit };
@@ -0,0 +1,53 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+
20
+ // src/utils/requestInit.ts
21
+ var requestInit_exports = {};
22
+ __export(requestInit_exports, {
23
+ mergeRequestInit: () => mergeRequestInit
24
+ });
25
+ module.exports = __toCommonJS(requestInit_exports);
26
+
27
+ // src/utils/headersInit.ts
28
+ var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
29
+ const base = new Headers(baseHeadersInit);
30
+ const override = new Headers(overrideHeadersInit);
31
+ const setCookies = base.getSetCookie().concat(override.getSetCookie());
32
+ base.delete("set-cookie");
33
+ override.delete("set-cookie");
34
+ const mergedHeaders = new Headers({
35
+ ...Object.fromEntries(base),
36
+ ...Object.fromEntries(override)
37
+ });
38
+ setCookies.forEach((cookie) => {
39
+ mergedHeaders.append("set-cookie", cookie);
40
+ });
41
+ return mergedHeaders;
42
+ };
43
+
44
+ // src/utils/requestInit.ts
45
+ var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
46
+ ...base,
47
+ ...override,
48
+ headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
49
+ });
50
+ // Annotate the CommonJS export names for ESM import in node:
51
+ 0 && (module.exports = {
52
+ mergeRequestInit
53
+ });
@@ -0,0 +1,8 @@
1
+ import {
2
+ mergeRequestInit
3
+ } from "../chunk-LYXJUKKR.mjs";
4
+ import "../chunk-SMMDKVWH.mjs";
5
+ import "../chunk-7P6ASYW6.mjs";
6
+ export {
7
+ mergeRequestInit
8
+ };
@@ -0,0 +1,2 @@
1
+
2
+ export { }
@@ -0,0 +1,2 @@
1
+
2
+ export { }