@readyfor/api-client-base 0.243.0-pr986.3fe5563 → 0.244.0-pr981.aa1d2e5

package/dist/react/ApiClientConfigProvider.mjs

@@ -1,9 +1,11 @@
 import {
   ApiClientConfigProvider,
   useApiClientConfigContext
-} from "../chunk-5ZI7SAUQ.mjs";
+} from "../chunk-T2LQ4KT5.mjs";
 import "../chunk-DH33ZDBG.mjs";
-import "../chunk-472P3XVV.mjs";
+import "../chunk-Z2IX5DM2.mjs";
+import "../chunk-2ORFVC4H.mjs";
+import "../chunk-GIFAQKW5.mjs";
 import "../chunk-3SEO7S3Q.mjs";
 export {
   ApiClientConfigProvider,

package/dist/react/index.js

@@ -52,6 +52,30 @@ var createStore = (initialState) => {
   };
 };
 
+// src/utils/headersInit.ts
+var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
+  const base = new Headers(baseHeadersInit);
+  const override = new Headers(overrideHeadersInit);
+  const setCookies = base.getSetCookie().concat(override.getSetCookie());
+  base.delete("set-cookie");
+  override.delete("set-cookie");
+  const mergedHeaders = new Headers({
+    ...Object.fromEntries(base),
+    ...Object.fromEntries(override)
+  });
+  setCookies.forEach((cookie) => {
+    mergedHeaders.append("set-cookie", cookie);
+  });
+  return mergedHeaders;
+};
+
+// src/utils/requestInit.ts
+var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
+  ...base,
+  ...override,
+  headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
+});
+
 // src/apiClientConfigStore.ts
 var defaultConfig = {};
 var store = createStore(defaultConfig);
@@ -106,37 +130,9 @@ var useApiClientConfigWithSelector = (selector) => {
 };
 var useRequestInit = (customRequestInit = {}) => {
   const { defaultRequestInit = {} } = useApiClientConfig();
-  const keys = (0, import_react3.useMemo)(
-    () => Object.keys({
-      ...defaultRequestInit,
-      ...customRequestInit
-    }),
-    [defaultRequestInit, customRequestInit]
-  );
-  const get = (0, import_react3.useCallback)((key) => {
-    if (customRequestInit[key] === void 0) {
-      return defaultRequestInit[key];
-    }
-    if (defaultRequestInit[key] === void 0) {
-      return customRequestInit[key];
-    }
-    if (typeof customRequestInit[key] === "object" && typeof defaultRequestInit[key] === "object") {
-      return { ...defaultRequestInit[key], ...customRequestInit[key] };
-    }
-    if (Array.isArray(customRequestInit[key]) && Array.isArray(defaultRequestInit[key])) {
-      return [...defaultRequestInit[key], ...customRequestInit[key]];
-    }
-    return customRequestInit[key] ?? defaultRequestInit[key];
-  }, []);
   return (0, import_react3.useMemo)(
-    () => keys.reduce(
-      (acc, key) => ({
-        ...acc,
-        [key]: get(key)
-      }),
-      {}
-    ),
-    [keys, get]
+    () => mergeRequestInit(defaultRequestInit, customRequestInit),
+    [defaultRequestInit, customRequestInit]
   );
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/react/index.mjs

@@ -2,15 +2,17 @@ import {
   useApiClientConfig,
   useApiClientConfigWithSelector,
   useRequestInit
-} from "../chunk-JOSDYCJN.mjs";
+} from "../chunk-X4CTIU5H.mjs";
 import {
   ApiClientConfigProvider,
   useApiClientConfigContext
-} from "../chunk-5ZI7SAUQ.mjs";
+} from "../chunk-T2LQ4KT5.mjs";
 import {
   createSwrConfig
 } from "../chunk-DH33ZDBG.mjs";
-import "../chunk-472P3XVV.mjs";
+import "../chunk-Z2IX5DM2.mjs";
+import "../chunk-2ORFVC4H.mjs";
+import "../chunk-GIFAQKW5.mjs";
 import "../chunk-3SEO7S3Q.mjs";
 export {
   ApiClientConfigProvider,

package/dist/react/useApiClientConfig.js

@@ -49,6 +49,30 @@ var createStore = (initialState) => {
   };
 };
 
+// src/utils/headersInit.ts
+var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
+  const base = new Headers(baseHeadersInit);
+  const override = new Headers(overrideHeadersInit);
+  const setCookies = base.getSetCookie().concat(override.getSetCookie());
+  base.delete("set-cookie");
+  override.delete("set-cookie");
+  const mergedHeaders = new Headers({
+    ...Object.fromEntries(base),
+    ...Object.fromEntries(override)
+  });
+  setCookies.forEach((cookie) => {
+    mergedHeaders.append("set-cookie", cookie);
+  });
+  return mergedHeaders;
+};
+
+// src/utils/requestInit.ts
+var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
+  ...base,
+  ...override,
+  headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
+});
+
 // src/apiClientConfigStore.ts
 var defaultConfig = {};
 var store = createStore(defaultConfig);
@@ -83,37 +107,9 @@ var useApiClientConfigWithSelector = (selector) => {
 };
 var useRequestInit = (customRequestInit = {}) => {
   const { defaultRequestInit = {} } = useApiClientConfig();
-  const keys = (0, import_react3.useMemo)(
-    () => Object.keys({
-      ...defaultRequestInit,
-      ...customRequestInit
-    }),
-    [defaultRequestInit, customRequestInit]
-  );
-  const get = (0, import_react3.useCallback)((key) => {
-    if (customRequestInit[key] === void 0) {
-      return defaultRequestInit[key];
-    }
-    if (defaultRequestInit[key] === void 0) {
-      return customRequestInit[key];
-    }
-    if (typeof customRequestInit[key] === "object" && typeof defaultRequestInit[key] === "object") {
-      return { ...defaultRequestInit[key], ...customRequestInit[key] };
-    }
-    if (Array.isArray(customRequestInit[key]) && Array.isArray(defaultRequestInit[key])) {
-      return [...defaultRequestInit[key], ...customRequestInit[key]];
-    }
-    return customRequestInit[key] ?? defaultRequestInit[key];
-  }, []);
   return (0, import_react3.useMemo)(
-    () => keys.reduce(
-      (acc, key) => ({
-        ...acc,
-        [key]: get(key)
-      }),
-      {}
-    ),
-    [keys, get]
+    () => mergeRequestInit(defaultRequestInit, customRequestInit),
+    [defaultRequestInit, customRequestInit]
   );
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/react/useApiClientConfig.mjs

@@ -2,10 +2,12 @@ import {
   useApiClientConfig,
   useApiClientConfigWithSelector,
   useRequestInit
-} from "../chunk-JOSDYCJN.mjs";
-import "../chunk-5ZI7SAUQ.mjs";
+} from "../chunk-X4CTIU5H.mjs";
+import "../chunk-T2LQ4KT5.mjs";
 import "../chunk-DH33ZDBG.mjs";
-import "../chunk-472P3XVV.mjs";
+import "../chunk-Z2IX5DM2.mjs";
+import "../chunk-2ORFVC4H.mjs";
+import "../chunk-GIFAQKW5.mjs";
 import "../chunk-3SEO7S3Q.mjs";
 export {
   useApiClientConfig,

package/dist/requestUrl.mjs

@@ -1,7 +1,9 @@
 import {
   __internal__requestUrl
-} from "./chunk-RGDL3AEX.mjs";
-import "./chunk-472P3XVV.mjs";
+} from "./chunk-EYKOWAWU.mjs";
+import "./chunk-Z2IX5DM2.mjs";
+import "./chunk-2ORFVC4H.mjs";
+import "./chunk-GIFAQKW5.mjs";
 import "./chunk-3SEO7S3Q.mjs";
 export {
   __internal__requestUrl

package/dist/utils/requestInit.d.mts

@@ -0,0 +1,9 @@
+/**
+ * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
+ * 同じフィールドが存在する場合、第二引数の値で上書きされる。
+ * ただし、`headers`フィールドに関しては、`base`と`override`両方に有効なHeadersInitがある場合に限り、
+ * `mergeHeadersInit`を使用してヘッダーの内容をマージする
+ */
+declare const mergeRequestInit: ({ headers: baseHeaders, ...base }: RequestInit, { headers: overrideHeaders, ...override }: RequestInit) => RequestInit;
+
+export { mergeRequestInit };

package/dist/utils/requestInit.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
+ * 同じフィールドが存在する場合、第二引数の値で上書きされる。
+ * ただし、`headers`フィールドに関しては、`base`と`override`両方に有効なHeadersInitがある場合に限り、
+ * `mergeHeadersInit`を使用してヘッダーの内容をマージする
+ */
+declare const mergeRequestInit: ({ headers: baseHeaders, ...base }: RequestInit, { headers: overrideHeaders, ...override }: RequestInit) => RequestInit;
+
+export { mergeRequestInit };

package/dist/utils/requestInit.js

@@ -0,0 +1,53 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/requestInit.ts
+var requestInit_exports = {};
+__export(requestInit_exports, {
+  mergeRequestInit: () => mergeRequestInit
+});
+module.exports = __toCommonJS(requestInit_exports);
+
+// src/utils/headersInit.ts
+var mergeHeadersInit = (baseHeadersInit, overrideHeadersInit) => {
+  const base = new Headers(baseHeadersInit);
+  const override = new Headers(overrideHeadersInit);
+  const setCookies = base.getSetCookie().concat(override.getSetCookie());
+  base.delete("set-cookie");
+  override.delete("set-cookie");
+  const mergedHeaders = new Headers({
+    ...Object.fromEntries(base),
+    ...Object.fromEntries(override)
+  });
+  setCookies.forEach((cookie) => {
+    mergedHeaders.append("set-cookie", cookie);
+  });
+  return mergedHeaders;
+};
+
+// src/utils/requestInit.ts
+var mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: overrideHeaders, ...override }) => ({
+  ...base,
+  ...override,
+  headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : mergeHeadersInit(baseHeaders, overrideHeaders)
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mergeRequestInit
+});

package/dist/utils/requestInit.mjs

@@ -0,0 +1,7 @@
+import {
+  mergeRequestInit
+} from "../chunk-2ORFVC4H.mjs";
+import "../chunk-GIFAQKW5.mjs";
+export {
+  mergeRequestInit
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readyfor/api-client-base",
-  "version": "0.243.0-pr986.3fe5563",
+  "version": "0.244.0-pr981.aa1d2e5",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -64,7 +64,10 @@
       "esm"
     ],
     "entry": [
-      "src"
+      "src/**/*.ts",
+      "src/**/*.tsx",
+      "!src/**/*.test.ts",
+      "!src/**/*.test.tsx"
     ]
   },
   "scripts": {

package/dist/chunk-472P3XVV.mjs

@@ -1,13 +0,0 @@
-import {
-  createStore
-} from "./chunk-3SEO7S3Q.mjs";
-
-// src/apiClientConfigStore.ts
-var defaultConfig = {};
-var store = createStore(defaultConfig);
-var setApiClientConfig = (config) => store.setState(() => config);
-
-export {
-  store,
-  setApiClientConfig
-};

package/dist/chunk-JOSDYCJN.mjs

@@ -1,62 +0,0 @@
-import {
-  useApiClientConfigContext
-} from "./chunk-5ZI7SAUQ.mjs";
-
-// src/react/useApiClientConfig.ts
-import { useCallback, useMemo } from "react";
-import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
-import { useSyncExternalStoreWithSelector } from "use-sync-external-store/shim/with-selector.js";
-var useApiClientConfig = () => {
-  const store = useApiClientConfigContext();
-  return useSyncExternalStore(store.subscribe, store.getState);
-};
-var useApiClientConfigWithSelector = (selector) => {
-  const store = useApiClientConfigContext();
-  return useSyncExternalStoreWithSelector(
-    store.subscribe,
-    store.getState,
-    null,
-    selector
-  );
-};
-var useRequestInit = (customRequestInit = {}) => {
-  const { defaultRequestInit = {} } = useApiClientConfig();
-  const keys = useMemo(
-    () => Object.keys({
-      ...defaultRequestInit,
-      ...customRequestInit
-    }),
-    [defaultRequestInit, customRequestInit]
-  );
-  const get = useCallback((key) => {
-    if (customRequestInit[key] === void 0) {
-      return defaultRequestInit[key];
-    }
-    if (defaultRequestInit[key] === void 0) {
-      return customRequestInit[key];
-    }
-    if (typeof customRequestInit[key] === "object" && typeof defaultRequestInit[key] === "object") {
-      return { ...defaultRequestInit[key], ...customRequestInit[key] };
-    }
-    if (Array.isArray(customRequestInit[key]) && Array.isArray(defaultRequestInit[key])) {
-      return [...defaultRequestInit[key], ...customRequestInit[key]];
-    }
-    return customRequestInit[key] ?? defaultRequestInit[key];
-  }, []);
-  return useMemo(
-    () => keys.reduce(
-      (acc, key) => ({
-        ...acc,
-        [key]: get(key)
-      }),
-      {}
-    ),
-    [keys, get]
-  );
-};
-
-export {
-  useApiClientConfig,
-  useApiClientConfigWithSelector,
-  useRequestInit
-};

package/dist/requestUrl.test.d.mts

@@ -1,2 +0,0 @@
-
-export {  }

package/dist/requestUrl.test.d.ts

@@ -1,2 +0,0 @@
-
-export {  }

package/dist/requestUrl.test.js

@@ -1,171 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// src/requestUrl.ts
-var import_qs = __toESM(require("qs"));
-
-// src/store.ts
-var createStore = (initialState) => {
-  let state = initialState;
-  const listeners = /* @__PURE__ */ new Set();
-  const getState = () => state;
-  const setState = (fn) => {
-    state = fn(state);
-    listeners.forEach((listener) => listener());
-  };
-  const subscribe = (listener) => {
-    listeners.add(listener);
-    return () => listeners.delete(listener);
-  };
-  return {
-    getState,
-    setState,
-    subscribe
-  };
-};
-
-// src/apiClientConfigStore.ts
-var defaultConfig = {};
-var store = createStore(defaultConfig);
-
-// src/requestUrl.ts
-function __internal__requestUrl(...args) {
-  const config2 = store.getState();
-  const rawPath = args[0];
-  const params = args[1] || {};
-  const query = args[2];
-  const hostName = config2.hostName ? typeof config2.hostName === "string" ? config2.hostName : config2.hostName(rawPath) : "";
-  const path = hostName + Object.entries(params).reduce(
-    (path2, [key, value]) => path2.replace(`{${key}}`, String(value)),
-    rawPath
-  );
-  return query ? `${path}?${import_qs.default.stringify(query)}` : path;
-}
-
-// src/requestUrl.test.ts
-var config = {
-  hostName: (url) => url.startsWith("/api/v1") ? "https://v1host.example.com" : "https://v2host.example.com"
-};
-describe("__internal_requestUrl", () => {
-  describe("path\u306E\u307F\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u6642", () => {
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u6642", () => {
-      test("path\u304C\u305D\u306E\u307E\u307E\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => ({}));
-        expect(__internal__requestUrl("/api/v1/my/fundraising/header")).toEqual(
-          "/api/v1/my/fundraising/header"
-        );
-        expect(__internal__requestUrl("/api/v2/token")).toEqual(
-          "/api/v2/token"
-        );
-      });
-    });
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u6642", () => {
-      test("hostUrl\u4ED8\u304D\u306EURL\u304C\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => config);
-        expect(__internal__requestUrl("/api/v1/my/fundraising/header")).toEqual(
-          "https://v1host.example.com/api/v1/my/fundraising/header"
-        );
-        expect(__internal__requestUrl("/api/v2/token")).toEqual(
-          "https://v2host.example.com/api/v2/token"
-        );
-      });
-    });
-  });
-  describe("path\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308B\u6642", () => {
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u6642", () => {
-      test("path\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u7F6E\u304D\u63DB\u3048\u3089\u308C\u305Fpath\u304C\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => ({}));
-        expect(
-          __internal__requestUrl(
-            "/api/v1/my/fundraising/projects/{project_id}",
-            {
-              project_id: 12345
-            }
-          )
-        ).toEqual("/api/v1/my/fundraising/projects/12345");
-      });
-    });
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u6642", () => {
-      test("path\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u7F6E\u304D\u63DB\u3048\u3089\u308C\u305FURL\u304C\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => config);
-        expect(
-          __internal__requestUrl(
-            "/api/v1/my/fundraising/projects/{project_id}",
-            {
-              project_id: 12345
-            }
-          )
-        ).toEqual(
-          "https://v1host.example.com/api/v1/my/fundraising/projects/12345"
-        );
-      });
-    });
-  });
-  describe("query\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308B\u6642", () => {
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u6642", () => {
-      test("query\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3064\u3051\u3089\u308C\u305Fpath\u304C\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => ({}));
-        expect(
-          __internal__requestUrl(
-            "/api/v1/my/messages/tree",
-            {},
-            { follow_id: 12345 }
-          )
-        ).toEqual("/api/v1/my/messages/tree?follow_id=12345");
-        expect(
-          __internal__requestUrl(
-            "/api/v2/contributions/project_info",
-            {},
-            { project_id: "12345" }
-          )
-        ).toEqual("/api/v2/contributions/project_info?project_id=12345");
-      });
-    });
-    describe("url\u306Econfig\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u6642", () => {
-      test("query\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3064\u3051\u3089\u308C\u305FURL\u304C\u8FD4\u3055\u308C\u308B", () => {
-        store.setState(() => config);
-        expect(
-          __internal__requestUrl(
-            "/api/v1/my/messages/tree",
-            {},
-            { follow_id: 12345 }
-          )
-        ).toEqual(
-          "https://v1host.example.com/api/v1/my/messages/tree?follow_id=12345"
-        );
-        expect(
-          __internal__requestUrl(
-            "/api/v2/contributions/project_info",
-            {},
-            { project_id: "12345" }
-          )
-        ).toEqual(
-          "https://v2host.example.com/api/v2/contributions/project_info?project_id=12345"
-        );
-      });
-    });
-  });
-  describe("path\u30D1\u30E9\u30E1\u30FC\u30BF\u3068query\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u3042\u308B\u6642", () => {
-  });
-});