@readyfor/api-client-base 0.242.1 → 0.243.0-pr981.418eff9

package/dist/index.mjs

@@ -3,31 +3,37 @@ import {
   createJsonFetcher,
   createTextFetcher,
   createVoidFetcher
-} from "./chunk-BNXKKSJH.mjs";
+} from "./chunk-E3EKMNYV.mjs";
 import {
   HTTPError,
   errorStatusCode,
   errorTitle,
   getErrorStatus
 } from "./chunk-PY35XWDS.mjs";
-import {
-  isZodError,
-  schemaForType
-} from "./chunk-JCZWXJBU.mjs";
 import {
   __internal__requestUrl
-} from "./chunk-RGDL3AEX.mjs";
+} from "./chunk-EYKOWAWU.mjs";
 import {
+  buildRequestInitWithDefaultConfig,
   setApiClientConfig,
   store
-} from "./chunk-472P3XVV.mjs";
+} from "./chunk-Z2IX5DM2.mjs";
+import {
+  mergeRequestInit
+} from "./chunk-2ORFVC4H.mjs";
+import "./chunk-GIFAQKW5.mjs";
 import {
   createStore
 } from "./chunk-3SEO7S3Q.mjs";
 import "./chunk-WBQAMGXK.mjs";
+import {
+  isZodError,
+  schemaForType
+} from "./chunk-JCZWXJBU.mjs";
 export {
   HTTPError,
   __internal__requestUrl,
+  buildRequestInitWithDefaultConfig,
   createBlobFetcher,
   createJsonFetcher,
   createStore,
@@ -37,6 +43,7 @@ export {
   errorTitle,
   getErrorStatus,
   isZodError,
+  mergeRequestInit,
   schemaForType,
   setApiClientConfig,
   store

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/headersInit.d.mts

@@ -0,0 +1,17 @@
+/**
+ * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
+ *
+ * Set-Cookieヘッダーは両方のHeadersInitから取得し、マージ後のHeadersに追加される。
+ * それ以外のヘッダーは、後勝ちの形式で新たなHeadersInitにマージされる。
+ *
+ * ヘッダーを削除する仕組みなどは非対応。
+ *
+ * Set-Cookieを特別扱いするのは、Fetch APIの仕様に基づいている。
+ * https://fetch.spec.whatwg.org/#terminology-headers
+ *
+ * @param baseHeadersInit 元となるHeadersInit
+ * @param overrideHeadersInit 上書きしたいヘッダーを含むHeadersInit。
+ */
+declare const mergeHeadersInit: (baseHeadersInit: HeadersInit, overrideHeadersInit: HeadersInit) => HeadersInit;
+
+export { mergeHeadersInit };

package/dist/utils/headersInit.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
+ *
+ * Set-Cookieヘッダーは両方のHeadersInitから取得し、マージ後のHeadersに追加される。
+ * それ以外のヘッダーは、後勝ちの形式で新たなHeadersInitにマージされる。
+ *
+ * ヘッダーを削除する仕組みなどは非対応。
+ *
+ * Set-Cookieを特別扱いするのは、Fetch APIの仕様に基づいている。
+ * https://fetch.spec.whatwg.org/#terminology-headers
+ *
+ * @param baseHeadersInit 元となるHeadersInit
+ * @param overrideHeadersInit 上書きしたいヘッダーを含むHeadersInit。
+ */
+declare const mergeHeadersInit: (baseHeadersInit: HeadersInit, overrideHeadersInit: HeadersInit) => HeadersInit;
+
+export { mergeHeadersInit };

package/dist/utils/headersInit.js

@@ -0,0 +1,44 @@
+"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/headersInit.ts
+var headersInit_exports = {};
+__export(headersInit_exports, {
+  mergeHeadersInit: () => mergeHeadersInit
+});
+module.exports = __toCommonJS(headersInit_exports);
+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;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mergeHeadersInit
+});

package/dist/utils/headersInit.mjs

@@ -0,0 +1,6 @@
+import {
+  mergeHeadersInit
+} from "../chunk-GIFAQKW5.mjs";
+export {
+  mergeHeadersInit
+};

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.242.1",
+  "version": "0.243.0-pr981.418eff9",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -27,9 +27,6 @@
       ]
     }
   },
-  "scripts": {
-    "build": "tsup"
-  },
   "dependencies": {
     "qs": "6.14.0",
     "zod": "^3.24.1"
@@ -38,9 +35,9 @@
     "@types/qs": "6.9.18",
     "@types/react": "19.1.2",
     "@types/use-sync-external-store": "1.5.0",
-    "react": "catalog:react19",
-    "swr": "catalog:",
-    "use-sync-external-store": "catalog:use-sync-external-store"
+    "react": "19.1.0",
+    "swr": "2.3.3",
+    "use-sync-external-store": "1.5.0"
   },
   "peerDependencies": {
     "react": ">=18.x <=19.x",
@@ -67,8 +64,13 @@
       "esm"
     ],
     "entry": [
-      "src"
+      "src/**/*.ts",
+      "src/**/*.tsx",
+      "!src/**/*.test.ts",
+      "!src/**/*.test.tsx"
     ]
   },
-  "gitHead": "5ab6de0f074cb6e80534983a87ec28bb7dfe0b4d"
-}
+  "scripts": {
+    "build": "tsup"
+  }
+}

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 {  }