@readyfor/api-client-base 1.155.0 → 1.155.1-pr1532.7d29327

package/dist/_virtual/_rolldown/runtime.js

@@ -1,4 +1,4 @@
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19,5 +19,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-//#endregion
 exports.__toESM = __toESM;

package/dist/{apiClientConfigStore-DDleIkQN.mjs → apiClientConfigStore-DbTqjD1_.mjs}

@@ -1,4 +1,4 @@
-//#region src/store.ts
+// src/store.ts
 const createStore = (initialState) => {
 	let state = initialState;
 	const listeners = /* @__PURE__ */ new Set();
@@ -17,8 +17,7 @@ const createStore = (initialState) => {
 		subscribe
 	};
 };
-//#endregion
-//#region src/utils/headersInit.ts
+// src/utils/headersInit.ts
 /**
 * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
 *
@@ -63,8 +62,7 @@ const toHeadersInit = (headers) => {
 	for (const [key, value] of Object.entries(headers)) if (value !== void 0) result[key] = String(value);
 	return result;
 };
-//#endregion
-//#region src/utils/requestInit.ts
+// src/utils/requestInit.ts
 /**
 * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
 * 同じフィールドが存在する場合、第二引数の値で上書きされる。
@@ -79,8 +77,8 @@ const mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: override
 const store = globalThis[Symbol.for("@readyfor/api-client-base/config")] ??= createStore({});
 const setApiClientConfig = (config) => store.setState(() => config);
 const buildRequestInitWithDefaultConfig = (customRequestInit = {}) => {
-	const { defaultRequestInit = {} } = store.getState();
-	return mergeRequestInit(defaultRequestInit, customRequestInit);
+	const { defaultRequestInit } = store.getState();
+	if (typeof defaultRequestInit === "function") return customRequestInit;
+	return mergeRequestInit(defaultRequestInit ?? {}, customRequestInit);
 };
-//#endregion
 export { mergeHeadersInit as a, mergeRequestInit as i, setApiClientConfig as n, toHeadersInit as o, store as r, createStore as s, buildRequestInitWithDefaultConfig as t };

package/dist/apiClientConfigStore.d.ts

@@ -1,5 +1,4 @@
 import { Store } from "./store.js";
-//#region src/apiClientConfigStore.d.ts
 type DeserializeResponseConfig = {
   forceDeserializeResponse?: false;
 } | {
@@ -11,12 +10,17 @@ type LoggingConfig = {
 };
 export type RequestConfig = {
   hostName?: string | ((path: string) => string);
-  defaultRequestInit?: RequestInit;
+  /**
+   * 関数を渡すと、設定時ではなく API 呼び出しごとに fetch の直前で評価される。リクエストごとに変わる値は設定時ではなくこの関数の中で読むこと。
+   * すべての宛先への fetch で呼ばれるため、転送してよい宛先かは必要に応じて `input` で判断すること。
+   * 受け取ったリクエストヘッダーを丸ごと返さず、必要なもの（Cookie や User-Agent など）だけを返すこと。host や connection などが混ざると fetch が失敗する。
+   * 同じフィールドや同名のヘッダーを API 呼び出し時の RequestInit で指定した場合は、そちらが優先される。
+   */
+  defaultRequestInit?: RequestInit | ((input: RequestInfo) => RequestInit | Promise<RequestInit>);
   onError?: (error: unknown) => void;
 };
 export type Config = RequestConfig & DeserializeResponseConfig & LoggingConfig;
 export declare const store: Store<Config>;
 export declare const setApiClientConfig: (config: Config) => void;
 export declare const buildRequestInitWithDefaultConfig: (customRequestInit?: RequestInit) => RequestInit;
-//#endregion
 export {};

package/dist/apiClientConfigStore.js

@@ -4,10 +4,10 @@ const require_utils_requestInit = require("./utils/requestInit.js");
 const store = globalThis[Symbol.for("@readyfor/api-client-base/config")] ??= require_store.createStore({});
 const setApiClientConfig = (config) => store.setState(() => config);
 const buildRequestInitWithDefaultConfig = (customRequestInit = {}) => {
-	const { defaultRequestInit = {} } = store.getState();
-	return require_utils_requestInit.mergeRequestInit(defaultRequestInit, customRequestInit);
+	const { defaultRequestInit } = store.getState();
+	if (typeof defaultRequestInit === "function") return customRequestInit;
+	return require_utils_requestInit.mergeRequestInit(defaultRequestInit ?? {}, customRequestInit);
 };
-//#endregion
 exports.buildRequestInitWithDefaultConfig = buildRequestInitWithDefaultConfig;
 exports.setApiClientConfig = setApiClientConfig;
 exports.store = store;

package/dist/apiError.d.ts

@@ -1,4 +1,3 @@
-//#region src/apiError.d.ts
 export type ErrorStatusCode = 301 | 302 | 400 | 401 | 403 | 404 | 409 | 413 | 418 | 422 | 500 | 502 | 503 | 504 | 540 | 901 | 999;
 export declare const errorStatusCode: {
   readonly MOVED_PERMANENTLY: 301;
@@ -35,5 +34,4 @@ export declare class HTTPError extends Error {
 export declare const isHttpErrorWithStatus: (error: unknown, status: number) => boolean;
 export declare const getHttpErrorBody: (error: unknown) => unknown;
 export declare const getHttpErrorBodyReason: (body: unknown) => string | undefined;
-export declare const getErrorStatus: (response: unknown) => ErrorStatusCode | undefined;
-//#endregion
+export declare const getErrorStatus: (response: unknown) => ErrorStatusCode | undefined;

package/dist/apiError.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_zod = require("./zod.js");
-//#region src/apiError.ts
+// src/apiError.ts
 const errorStatusCode = {
 	MOVED_PERMANENTLY: 301,
 	FOUND: 302,
@@ -70,7 +70,6 @@ const getErrorStatus = (response) => {
 	}
 	if (require_zod.isZodError(response)) return errorStatusCode.ZOD_ERROR;
 };
-//#endregion
 exports.HTTPError = HTTPError;
 exports.errorStatusCode = errorStatusCode;
 exports.errorTitle = errorTitle;

package/dist/fetcher.d.ts

@@ -1,5 +1,4 @@
 import { z } from "zod";
-//#region src/fetcher.d.ts
 export type FetcherOptions = {
   /**
    * フェッチャー本体が後段でボディを読むため、ここでボディを消費してはいけない。
@@ -18,5 +17,4 @@ export type FileOrBlobFetcherResponse = {
   headers: Headers;
 };
 export declare const createFileOrBlobFetcher: (customRequestInit?: RequestInit, options?: FetcherOptions) => (input: RequestInfo, requestInit?: RequestInit) => Promise<FileOrBlobFetcherResponse>;
-export declare const createVoidFetcher: (customRequestInit?: RequestInit, options?: FetcherOptions) => (input: RequestInfo, requestInit?: RequestInit) => Promise<void>;
-//#endregion
+export declare const createVoidFetcher: (customRequestInit?: RequestInit, options?: FetcherOptions) => (input: RequestInfo, requestInit?: RequestInit) => Promise<void>;

package/dist/fetcher.js

@@ -2,9 +2,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_utils_requestInit = require("./utils/requestInit.js");
 const require_apiClientConfigStore = require("./apiClientConfigStore.js");
 const require_apiError = require("./apiError.js");
-//#region src/fetcher.ts
+// src/fetcher.ts
 const defaultRequestInit = { credentials: "include" };
-const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const fetchWithDefaultRequestInit = (input, customRequestInit, requestInit) => {
+	const callerRequestInit = require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit);
+	const { defaultRequestInit: configDefaultRequestInit } = require_apiClientConfigStore.store.getState();
+	if (typeof configDefaultRequestInit !== "function") return fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, callerRequestInit));
+	return Promise.resolve().then(() => configDefaultRequestInit(input)).then((resolved) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(resolved, callerRequestInit))));
+};
+const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const text = await res.text();
 	const body = text ? JSON.parse(text) : {};
@@ -25,7 +31,7 @@ const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (inp
 	}
 	throw result.error;
 });
-const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.text();
 	if (res.ok) return body;
@@ -35,7 +41,7 @@ const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	require_apiClientConfigStore.store.getState().onError?.(error);
 	throw error;
 });
-const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.blob();
 	if (res.ok) return {
@@ -48,7 +54,7 @@ const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	require_apiClientConfigStore.store.getState().onError?.(error);
 	throw error;
 });
-const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.blob();
 	if (res.ok) return {
@@ -61,7 +67,7 @@ const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input
 	require_apiClientConfigStore.store.getState().onError?.(error);
 	throw error;
 });
-const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, require_utils_requestInit.mergeRequestInit(defaultRequestInit, require_utils_requestInit.mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	if (res.ok) return;
 	const code = Object.values(require_apiError.errorStatusCode).includes(res.status) ? res.status : 999;
@@ -71,7 +77,6 @@ const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	require_apiClientConfigStore.store.getState().onError?.(error);
 	throw error;
 });
-//#endregion
 exports.createBlobFetcher = createBlobFetcher;
 exports.createFileOrBlobFetcher = createFileOrBlobFetcher;
 exports.createJsonFetcher = createJsonFetcher;

package/dist/index.mjs

@@ -1,12 +1,11 @@
-import { a as mergeHeadersInit, i as mergeRequestInit, n as setApiClientConfig, o as toHeadersInit, r as store, s as createStore, t as buildRequestInitWithDefaultConfig } from "./apiClientConfigStore-DDleIkQN.mjs";
+import { a as mergeHeadersInit, i as mergeRequestInit, n as setApiClientConfig, o as toHeadersInit, r as store, s as createStore, t as buildRequestInitWithDefaultConfig } from "./apiClientConfigStore-DbTqjD1_.mjs";
 import qs from "qs";
-//#region src/zod.ts
+// src/zod.ts
 const schemaForType = () => (arg) => {
 	return arg;
 };
 const isZodError = (obj) => obj !== null && typeof obj === "object" && obj.constructor.name === "ZodError";
-//#endregion
-//#region src/apiError.ts
+// src/apiError.ts
 const errorStatusCode = {
 	MOVED_PERMANENTLY: 301,
 	FOUND: 302,
@@ -76,10 +75,15 @@ const getErrorStatus = (response) => {
 	}
 	if (isZodError(response)) return errorStatusCode.ZOD_ERROR;
 };
-//#endregion
-//#region src/fetcher.ts
+// src/fetcher.ts
 const defaultRequestInit = { credentials: "include" };
-const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const fetchWithDefaultRequestInit = (input, customRequestInit, requestInit) => {
+	const callerRequestInit = mergeRequestInit(customRequestInit, requestInit);
+	const { defaultRequestInit: configDefaultRequestInit } = store.getState();
+	if (typeof configDefaultRequestInit !== "function") return fetch(input, mergeRequestInit(defaultRequestInit, callerRequestInit));
+	return Promise.resolve().then(() => configDefaultRequestInit(input)).then((resolved) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(resolved, callerRequestInit))));
+};
+const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const text = await res.text();
 	const body = text ? JSON.parse(text) : {};
@@ -99,7 +103,7 @@ const createJsonFetcher = (schema, customRequestInit = {}, options = {}) => (inp
 	}
 	throw result.error;
 });
-const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.text();
 	if (res.ok) return body;
@@ -108,7 +112,7 @@ const createTextFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	store.getState().onError?.(error);
 	throw error;
 });
-const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.blob();
 	if (res.ok) return {
@@ -120,7 +124,7 @@ const createBlobFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	store.getState().onError?.(error);
 	throw error;
 });
-const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	const body = await res.blob();
 	if (res.ok) return {
@@ -132,7 +136,7 @@ const createFileOrBlobFetcher = (customRequestInit = {}, options = {}) => (input
 	store.getState().onError?.(error);
 	throw error;
 });
-const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetch(input, mergeRequestInit(defaultRequestInit, mergeRequestInit(customRequestInit, requestInit))).then(async (res) => {
+const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requestInit = {}) => fetchWithDefaultRequestInit(input, customRequestInit, requestInit).then(async (res) => {
 	options.onResponse?.(res);
 	if (res.ok) return;
 	throw new HTTPError(Object.values(errorStatusCode).includes(res.status) ? res.status : 999, await res.text());
@@ -140,12 +144,10 @@ const createVoidFetcher = (customRequestInit = {}, options = {}) => (input, requ
 	store.getState().onError?.(error);
 	throw error;
 });
-//#endregion
-//#region src/requestUrl.ts
+// src/requestUrl.ts
 const __internal__requestUrl = (rawPath, { path: pathParams = {}, query } = {}) => {
 	const config = store.getState();
 	const path = (config.hostName ? typeof config.hostName === "string" ? config.hostName : config.hostName(rawPath) : "") + Object.entries(pathParams).reduce((path, [key, value]) => path.replace(`{${key}}`, String(value)), rawPath);
 	return query ? `${path}?${qs.stringify(query)}` : path;
 };
-//#endregion
 export { HTTPError, __internal__requestUrl, buildRequestInitWithDefaultConfig, createBlobFetcher, createFileOrBlobFetcher, createJsonFetcher, createStore, createTextFetcher, createVoidFetcher, errorStatusCode, errorTitle, getErrorStatus, getHttpErrorBody, getHttpErrorBodyReason, isHttpErrorWithStatus, isZodError, mergeHeadersInit, mergeRequestInit, schemaForType, setApiClientConfig, store, toHeadersInit };

package/dist/react/ApiClientConfigProvider.d.ts

@@ -2,7 +2,6 @@ import { Store } from "../store.js";
 import { Config } from "../apiClientConfigStore.js";
 import { FC, ReactNode } from "react";
 import { SWRConfiguration } from "swr";
-//#region src/react/ApiClientConfigProvider.d.ts
 type Configuration = Config & {
   swr?: SWRConfiguration;
 };
@@ -12,5 +11,4 @@ type Props = {
 };
 export declare const ApiClientConfigProvider: FC<Props>;
 export declare const useApiClientConfigContext: () => Store<Config>;
-//#endregion
 export {};

package/dist/react/ApiClientConfigProvider.js

@@ -4,7 +4,7 @@ const require_react_swr = require("./swr.js");
 let react = require("react");
 let swr = require("swr");
 let react_jsx_runtime = require("react/jsx-runtime");
-//#region src/react/ApiClientConfigProvider.tsx
+// src/react/ApiClientConfigProvider.tsx
 const ApiClientConfigContext = (0, react.createContext)(require_apiClientConfigStore.store);
 const ApiClientConfigProvider = (props) => {
 	const { swr: swr$1, ...config } = props.config;
@@ -20,6 +20,5 @@ const ApiClientConfigProvider = (props) => {
 	});
 };
 const useApiClientConfigContext = () => (0, react.useContext)(ApiClientConfigContext) || require_apiClientConfigStore.store;
-//#endregion
 exports.ApiClientConfigProvider = ApiClientConfigProvider;
 exports.useApiClientConfigContext = useApiClientConfigContext;

package/dist/react/index.mjs

@@ -1,10 +1,10 @@
-import { i as mergeRequestInit, r as store } from "../apiClientConfigStore-DDleIkQN.mjs";
+import { i as mergeRequestInit, r as store } from "../apiClientConfigStore-DbTqjD1_.mjs";
 import { createContext, useContext, useEffect, useMemo, useRef } from "react";
 import { SWRConfig } from "swr";
 import { jsx } from "react/jsx-runtime";
 import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 import { useSyncExternalStoreWithSelector } from "use-sync-external-store/shim/with-selector.js";
-//#region src/react/swr.ts
+// src/react/swr.ts
 /**
 * requestのfetchを中断させるためのmiddleware
 *
@@ -27,8 +27,7 @@ const createSwrConfig = (config) => ({
 	...config,
 	use: [...config?.use ?? [], abortMiddleware]
 });
-//#endregion
-//#region src/react/ApiClientConfigProvider.tsx
+// src/react/ApiClientConfigProvider.tsx
 const ApiClientConfigContext = createContext(store);
 const ApiClientConfigProvider = (props) => {
 	const { swr, ...config } = props.config;
@@ -44,8 +43,7 @@ const ApiClientConfigProvider = (props) => {
 	});
 };
 const useApiClientConfigContext = () => useContext(ApiClientConfigContext) || store;
-//#endregion
-//#region src/react/useApiClientConfig.ts
+// src/react/useApiClientConfig.ts
 const useApiClientConfig = () => {
 	const store = useApiClientConfigContext();
 	return useSyncExternalStore(store.subscribe, store.getState, store.getState);
@@ -55,8 +53,7 @@ const useApiClientConfigWithSelector = (selector) => {
 	return useSyncExternalStoreWithSelector(store.subscribe, store.getState, store.getState, selector);
 };
 const useRequestInit = (customRequestInit = {}) => {
-	const { defaultRequestInit = {} } = useApiClientConfig();
-	return useMemo(() => mergeRequestInit(defaultRequestInit, customRequestInit), [defaultRequestInit, customRequestInit]);
+	const { defaultRequestInit } = useApiClientConfig();
+	return useMemo(() => typeof defaultRequestInit === "function" ? customRequestInit : mergeRequestInit(defaultRequestInit ?? {}, customRequestInit), [defaultRequestInit, customRequestInit]);
 };
-//#endregion
 export { ApiClientConfigProvider, createSwrConfig, useApiClientConfig, useApiClientConfigContext, useApiClientConfigWithSelector, useRequestInit };

package/dist/react/swr.d.ts

@@ -1,5 +1,4 @@
 import { SWRConfiguration } from "swr";
-//#region src/react/swr.d.ts
 export type Configuration<T> = SWRConfiguration<T> & {
   /**
    * fetchを止めるかどうかのオプション
@@ -8,5 +7,4 @@ export type Configuration<T> = SWRConfiguration<T> & {
    */
   shouldNotFetch?: boolean;
 };
-export declare const createSwrConfig: (config?: SWRConfiguration) => SWRConfiguration;
-//#endregion
+export declare const createSwrConfig: (config?: SWRConfiguration) => SWRConfiguration;

package/dist/react/swr.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let react = require("react");
-//#region src/react/swr.ts
+// src/react/swr.ts
 /**
 * requestのfetchを中断させるためのmiddleware
 *
@@ -23,5 +23,4 @@ const createSwrConfig = (config) => ({
 	...config,
 	use: [...config?.use ?? [], abortMiddleware]
 });
-//#endregion
 exports.createSwrConfig = createSwrConfig;

package/dist/react/useApiClientConfig.d.ts

@@ -1,6 +1,4 @@
 import { Config } from "../apiClientConfigStore.js";
-//#region src/react/useApiClientConfig.d.ts
 export declare const useApiClientConfig: () => any;
 export declare const useApiClientConfigWithSelector: <T>(selector: (state: Config) => T) => T;
-export declare const useRequestInit: (customRequestInit?: RequestInit) => RequestInit;
-//#endregion
+export declare const useRequestInit: (customRequestInit?: RequestInit) => RequestInit;

package/dist/react/useApiClientConfig.js

@@ -4,7 +4,7 @@ const require_react_ApiClientConfigProvider = require("./ApiClientConfigProvider
 let react = require("react");
 let use_sync_external_store_shim_index_js = require("use-sync-external-store/shim/index.js");
 let use_sync_external_store_shim_with_selector_js = require("use-sync-external-store/shim/with-selector.js");
-//#region src/react/useApiClientConfig.ts
+// src/react/useApiClientConfig.ts
 const useApiClientConfig = () => {
 	const store = require_react_ApiClientConfigProvider.useApiClientConfigContext();
 	return (0, use_sync_external_store_shim_index_js.useSyncExternalStore)(store.subscribe, store.getState, store.getState);
@@ -14,10 +14,9 @@ const useApiClientConfigWithSelector = (selector) => {
 	return (0, use_sync_external_store_shim_with_selector_js.useSyncExternalStoreWithSelector)(store.subscribe, store.getState, store.getState, selector);
 };
 const useRequestInit = (customRequestInit = {}) => {
-	const { defaultRequestInit = {} } = useApiClientConfig();
-	return (0, react.useMemo)(() => require_utils_requestInit.mergeRequestInit(defaultRequestInit, customRequestInit), [defaultRequestInit, customRequestInit]);
+	const { defaultRequestInit } = useApiClientConfig();
+	return (0, react.useMemo)(() => typeof defaultRequestInit === "function" ? customRequestInit : require_utils_requestInit.mergeRequestInit(defaultRequestInit ?? {}, customRequestInit), [defaultRequestInit, customRequestInit]);
 };
-//#endregion
 exports.useApiClientConfig = useApiClientConfig;
 exports.useApiClientConfigWithSelector = useApiClientConfigWithSelector;
 exports.useRequestInit = useRequestInit;

package/dist/requestUrl.d.ts

@@ -1,4 +1,3 @@
-//#region src/requestUrl.d.ts
 type PathParams = Record<string, string | number>;
 type QueryParams = Record<string, unknown>;
 type UrlArgs = {
@@ -6,5 +5,4 @@ type UrlArgs = {
   query?: QueryParams;
 };
 export declare const __internal__requestUrl: (rawPath: string, { path: pathParams, query }?: UrlArgs) => string;
-//#endregion
 export {};

package/dist/requestUrl.js

@@ -3,11 +3,10 @@ const require_runtime = require("./_virtual/_rolldown/runtime.js");
 const require_apiClientConfigStore = require("./apiClientConfigStore.js");
 let qs = require("qs");
 qs = require_runtime.__toESM(qs);
-//#region src/requestUrl.ts
+// src/requestUrl.ts
 const __internal__requestUrl = (rawPath, { path: pathParams = {}, query } = {}) => {
 	const config = require_apiClientConfigStore.store.getState();
 	const path = (config.hostName ? typeof config.hostName === "string" ? config.hostName : config.hostName(rawPath) : "") + Object.entries(pathParams).reduce((path, [key, value]) => path.replace(`{${key}}`, String(value)), rawPath);
 	return query ? `${path}?${qs.default.stringify(query)}` : path;
 };
-//#endregion
 exports.__internal__requestUrl = __internal__requestUrl;

package/dist/store.d.ts

@@ -1,4 +1,3 @@
-//#region src/store.d.ts
 type Listener = () => void;
 type GetState<T> = () => T;
 type SetState<T> = (fn: (state: T) => T) => void;
@@ -10,5 +9,4 @@ export type Store<T> = {
   subscribe: Subscribe;
 };
 export declare const createStore: <T>(initialState: T) => Store<T>;
-//#endregion
 export {};

package/dist/store.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/store.ts
+// src/store.ts
 const createStore = (initialState) => {
 	let state = initialState;
 	const listeners = /* @__PURE__ */ new Set();
@@ -18,5 +18,4 @@ const createStore = (initialState) => {
 		subscribe
 	};
 };
-//#endregion
 exports.createStore = createStore;

package/dist/types.d.ts

@@ -1,6 +1,4 @@
-//#region src/types.d.ts
 export type ForceDig<T, K extends string[]> = K extends [infer P extends string, ...infer Rest extends string[]] ? T extends { [key in P]?: infer S; } ? ForceDig<Exclude<S, undefined>, Rest> : Record<string, never> : T;
 type RemoveBracket<T> = T extends `${infer S}[]` ? S : T;
 export type QueryPropsFor<T extends Record<string, unknown>> = { [K in keyof T as RemoveBracket<K>]: K extends `${string}[]` ? Exclude<T[K], undefined>[] : T[K]; };
-//#endregion
 export {};

package/dist/utils/headersInit.d.ts

@@ -1,4 +1,3 @@
-//#region src/utils/headersInit.d.ts
 /**
  * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
  *
@@ -24,5 +23,4 @@ export declare const mergeHeadersInit: (baseHeadersInit: HeadersInit, overrideHe
  * @param headers OpenAPI から生成されたヘッダーオブジェクト
  * @returns HeadersInit として使用可能なオブジェクト
  */
-export declare const toHeadersInit: (headers: Record<string, string | number | boolean | undefined>) => HeadersInit;
-//#endregion
+export declare const toHeadersInit: (headers: Record<string, string | number | boolean | undefined>) => HeadersInit;

package/dist/utils/headersInit.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/utils/headersInit.ts
+// src/utils/headersInit.ts
 /**
 * 二つのHeadersInitの情報を元に、新たなHeadersInitを作成する
 *
@@ -44,6 +44,5 @@ const toHeadersInit = (headers) => {
 	for (const [key, value] of Object.entries(headers)) if (value !== void 0) result[key] = String(value);
 	return result;
 };
-//#endregion
 exports.mergeHeadersInit = mergeHeadersInit;
 exports.toHeadersInit = toHeadersInit;

package/dist/utils/requestInit.d.ts

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

package/dist/utils/requestInit.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_utils_headersInit = require("./headersInit.js");
-//#region src/utils/requestInit.ts
+// src/utils/requestInit.ts
 /**
 * 第一引数と第二引数のequestInitをマージした新たなRequestInitを返す。
 * 同じフィールドが存在する場合、第二引数の値で上書きされる。
@@ -12,5 +12,4 @@ const mergeRequestInit = ({ headers: baseHeaders, ...base }, { headers: override
 	...override,
 	headers: baseHeaders === void 0 ? overrideHeaders : overrideHeaders === void 0 ? baseHeaders : require_utils_headersInit.mergeHeadersInit(baseHeaders, overrideHeaders)
 });
-//#endregion
 exports.mergeRequestInit = mergeRequestInit;

package/dist/zod.d.ts

@@ -1,5 +1,3 @@
 import { z } from "zod";
-//#region src/zod.d.ts
 export declare const schemaForType: <T>() => <S extends z.ZodType<T>>(arg: S) => S;
-export declare const isZodError: (obj: unknown) => obj is z.ZodError;
-//#endregion
+export declare const isZodError: (obj: unknown) => obj is z.ZodError;

package/dist/zod.js

@@ -1,9 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/zod.ts
+// src/zod.ts
 const schemaForType = () => (arg) => {
 	return arg;
 };
 const isZodError = (obj) => obj !== null && typeof obj === "object" && obj.constructor.name === "ZodError";
-//#endregion
 exports.isZodError = isZodError;
 exports.schemaForType = schemaForType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readyfor/api-client-base",
-  "version": "1.155.0",
+  "version": "1.155.1-pr1532.7d29327",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "dist/index.js",
   "module": "dist/index.mjs",