@cp949/japanpost-react 1.0.3 → 1.0.4

package/dist/index.es.js

@@ -1,299 +1,530 @@
-import { useCallback as e, useEffect as t, useMemo as n, useRef as r, useState as i } from "react";
-import { jsx as a, jsxs as o } from "react/jsx-runtime";
-//#region src/components/AddressSearchInput.tsx
-function s({ defaultValue: e = "", value: t, disabled: n, label: r = "Address keyword", buttonLabel: s = "Search", inputProps: c, buttonProps: l, onChange: u, onSearch: d }) {
-	let [f, p] = i(e), m = t ?? f;
-	function h(e) {
-		e.preventDefault(), d(m.trim());
-	}
-	function g(e) {
-		t === void 0 && p(e), u?.(e);
-	}
-	return /* @__PURE__ */ o("form", {
-		onSubmit: h,
-		children: [/* @__PURE__ */ o("label", { children: [r, /* @__PURE__ */ a("input", {
-			...c,
-			disabled: n,
-			value: m,
-			onChange: (e) => g(e.target.value)
-		})] }), /* @__PURE__ */ a("button", {
-			...l,
-			disabled: n,
-			type: "submit",
-			children: s
-		})]
-	});
+import { useState, useMemo, useRef, useCallback, useEffect } from 'react';
+import { jsxs, jsx } from 'react/jsx-runtime';
+
+// src/components/AddressSearchInput.tsx
+function AddressSearchInput({
+  defaultValue = "",
+  value,
+  disabled,
+  label = "Address keyword",
+  buttonLabel = "Search",
+  inputProps,
+  buttonProps,
+  onChange,
+  onSearch
+}) {
+  const [internalValue, setInternalValue] = useState(defaultValue);
+  const currentValue = value ?? internalValue;
+  function handleSubmit(event) {
+    event.preventDefault();
+    onSearch(currentValue.trim());
+  }
+  function handleChange(nextValue) {
+    if (value === void 0) {
+      setInternalValue(nextValue);
+    }
+    onChange?.(nextValue);
+  }
+  return /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, children: [
+    /* @__PURE__ */ jsxs("label", { children: [
+      label,
+      /* @__PURE__ */ jsx(
+        "input",
+        {
+          ...inputProps,
+          disabled,
+          value: currentValue,
+          onChange: (event) => handleChange(event.target.value)
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx("button", { ...buttonProps, disabled, type: "submit", children: buttonLabel })
+  ] });
 }
-//#endregion
-//#region src/core/formatters.ts
-function c(e) {
-	return e.replace(/[^\d]/g, "");
+
+// src/core/formatters.ts
+function normalizeJapanPostalCode(value) {
+  return value.replace(/[^\d]/g, "");
 }
-function l(e) {
-	let t = c(e);
-	return t.length === 7 ? `${t.slice(0, 3)}-${t.slice(3)}` : t;
+function formatJapanPostalCode(value) {
+  const normalized = normalizeJapanPostalCode(value);
+  if (normalized.length !== 7) {
+    return normalized;
+  }
+  return `${normalized.slice(0, 3)}-${normalized.slice(3)}`;
 }
-//#endregion
-//#region src/components/PostalCodeInput.tsx
-function u({ defaultValue: e = "", value: t, disabled: n, label: r = "Postal code", buttonLabel: s = "Search", inputProps: l, buttonProps: u, onChange: d, onSearch: f }) {
-	let [p, m] = i(e), h = t ?? p;
-	function g(e) {
-		e.preventDefault(), f(c(h));
-	}
-	function _(e) {
-		t === void 0 && m(e), d?.(e);
-	}
-	return /* @__PURE__ */ o("form", {
-		onSubmit: g,
-		children: [/* @__PURE__ */ o("label", { children: [r, /* @__PURE__ */ a("input", {
-			...l,
-			disabled: n,
-			inputMode: l?.inputMode ?? "numeric",
-			value: h,
-			onChange: (e) => _(e.target.value)
-		})] }), /* @__PURE__ */ a("button", {
-			...u,
-			disabled: n,
-			type: "submit",
-			children: s
-		})]
-	});
+function PostalCodeInput({
+  defaultValue = "",
+  value,
+  disabled,
+  label = "Postal code",
+  buttonLabel = "Search",
+  inputProps,
+  buttonProps,
+  onChange,
+  onSearch
+}) {
+  const [internalValue, setInternalValue] = useState(defaultValue);
+  const currentValue = value ?? internalValue;
+  function handleSubmit(event) {
+    event.preventDefault();
+    onSearch(normalizeJapanPostalCode(currentValue));
+  }
+  function handleChange(nextValue) {
+    if (value === void 0) {
+      setInternalValue(nextValue);
+    }
+    onChange?.(nextValue);
+  }
+  return /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, children: [
+    /* @__PURE__ */ jsxs("label", { children: [
+      label,
+      /* @__PURE__ */ jsx(
+        "input",
+        {
+          ...inputProps,
+          disabled,
+          inputMode: inputProps?.inputMode ?? "numeric",
+          value: currentValue,
+          onChange: (event) => handleChange(event.target.value)
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx("button", { ...buttonProps, disabled, type: "submit", children: buttonLabel })
+  ] });
 }
-//#endregion
-//#region src/core/errors.ts
-function d(e, t, n) {
-	let r = Error(t);
-	return r.name = "JapanAddressError", r.code = e, r.cause = n?.cause, r.status = n?.status, r;
+
+// src/core/errors.ts
+function createJapanAddressError(code, message, options) {
+  const error = new Error(message);
+  error.name = "JapanAddressError";
+  error.code = code;
+  error.cause = options?.cause;
+  error.status = options?.status;
+  return error;
 }
-//#endregion
-//#region src/core/normalizers.ts
-function f(e) {
-	return e.filter(Boolean).join(" ").trim();
+
+// src/core/normalizers.ts
+function joinAddressParts(parts) {
+  return parts.filter(Boolean).join(" ").trim();
 }
-function p(e) {
-	let t = f([
-		e.prefecture,
-		e.city,
-		e.town,
-		e.detail ?? ""
-	]);
-	return {
-		postalCode: e.postalCode,
-		prefecture: e.prefecture,
-		prefectureKana: e.prefectureKana,
-		city: e.city,
-		cityKana: e.cityKana,
-		town: e.town,
-		townKana: e.townKana,
-		address: t,
-		provider: "japan-post"
-	};
+function normalizeJapanPostAddressRecord(record) {
+  const address = joinAddressParts([
+    record.prefecture,
+    record.city,
+    record.town,
+    record.detail ?? ""
+  ]);
+  return {
+    postalCode: record.postalCode,
+    prefecture: record.prefecture,
+    prefectureKana: record.prefectureKana,
+    city: record.city,
+    cityKana: record.cityKana,
+    town: record.town,
+    townKana: record.townKana,
+    address,
+    provider: "japan-post"
+  };
 }
-//#endregion
-//#region src/core/validators.ts
-function m(e) {
-	return /^\d{7}$/.test(c(e));
+
+// src/core/validators.ts
+function isValidJapanPostalCode(value) {
+  return /^\d{7}$/.test(normalizeJapanPostalCode(value));
 }
-//#endregion
-//#region src/react/toJapanAddressError.ts
-function h(e) {
-	return typeof e == "object" && e && "code" in e && typeof e.code == "string" ? e : d("data_source_error", e instanceof Error ? e.message : "Unknown error", { cause: e });
+
+// src/react/toJapanAddressError.ts
+function toJapanAddressError(error) {
+  if (typeof error === "object" && error !== null && "code" in error && typeof error.code === "string") {
+    return error;
+  }
+  return createJapanAddressError(
+    "data_source_error",
+    error instanceof Error ? error.message : "Unknown error",
+    {
+      cause: error
+    }
+  );
 }
-//#endregion
-//#region src/react/useLatestRequestState.ts
-function g() {
-	let n = r(0), a = r(!0), o = r(null), [s, c] = i(!1), [l, u] = i(null), [d, f] = i(null), p = e((e) => a.current && e === n.current, []), m = e(() => {
-		n.current += 1, o.current?.abort(), o.current = null;
-	}, []);
-	t(() => (a.current = !0, () => {
-		a.current = !1, m();
-	}), [m]);
-	let h = e(() => {
-		let e = n.current + 1;
-		n.current = e, o.current?.abort();
-		let t = new AbortController();
-		return o.current = t, c(!0), f(null), {
-			requestId: e,
-			signal: t.signal
-		};
-	}, []), g = e((e, t) => {
-		p(e) && u(t);
-	}, [p]), _ = e((e, t) => (p(e) && (f(t), u(null)), null), [p]), v = e(() => {
-		m(), c(!1);
-	}, [m]);
-	return {
-		loading: s,
-		data: l,
-		error: d,
-		beginRequest: h,
-		setSuccess: g,
-		setFailure: _,
-		finishRequest: e((e) => {
-			p(e) && (c(!1), o.current = null);
-		}, [p]),
-		cancel: v,
-		reset: e(() => {
-			v(), u(null), f(null);
-		}, [v])
-	};
+function useLatestRequestState() {
+  const requestIdRef = useRef(0);
+  const isMountedRef = useRef(true);
+  const abortControllerRef = useRef(null);
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState(null);
+  const [error, setError] = useState(null);
+  const isCurrentRequest = useCallback((requestId) => {
+    return isMountedRef.current && requestId === requestIdRef.current;
+  }, []);
+  const invalidateCurrentRequest = useCallback(() => {
+    requestIdRef.current += 1;
+    abortControllerRef.current?.abort();
+    abortControllerRef.current = null;
+  }, []);
+  useEffect(() => {
+    isMountedRef.current = true;
+    return () => {
+      isMountedRef.current = false;
+      invalidateCurrentRequest();
+    };
+  }, [invalidateCurrentRequest]);
+  const beginRequest = useCallback(() => {
+    const requestId = requestIdRef.current + 1;
+    requestIdRef.current = requestId;
+    abortControllerRef.current?.abort();
+    const abortController = new AbortController();
+    abortControllerRef.current = abortController;
+    setLoading(true);
+    setError(null);
+    return {
+      requestId,
+      signal: abortController.signal
+    };
+  }, []);
+  const setSuccess = useCallback((requestId, result) => {
+    if (isCurrentRequest(requestId)) {
+      setData(result);
+    }
+  }, [isCurrentRequest]);
+  const setFailure = useCallback(
+    (requestId, nextError) => {
+      if (isCurrentRequest(requestId)) {
+        setError(nextError);
+        setData(null);
+      }
+      return null;
+    },
+    [isCurrentRequest]
+  );
+  const cancel = useCallback(() => {
+    invalidateCurrentRequest();
+    setLoading(false);
+  }, [invalidateCurrentRequest]);
+  const finishRequest = useCallback((requestId) => {
+    if (isCurrentRequest(requestId)) {
+      setLoading(false);
+      abortControllerRef.current = null;
+    }
+  }, [isCurrentRequest]);
+  const reset = useCallback(() => {
+    cancel();
+    setData(null);
+    setError(null);
+  }, [cancel]);
+  return {
+    loading,
+    data,
+    error,
+    beginRequest,
+    setSuccess,
+    setFailure,
+    finishRequest,
+    cancel,
+    reset
+  };
 }
-//#endregion
-//#region src/react/useJapanAddressSearch.ts
-function _(e) {
-	if (e) return e;
-	throw Error("useJapanAddressSearch requires options.dataSource");
+
+// src/react/useJapanAddressSearch.ts
+function resolveAddressSearchDataSource(dataSource) {
+  if (dataSource) {
+    return dataSource;
+  }
+  throw new Error("useJapanAddressSearch requires options.dataSource");
 }
-function v(e) {
-	return e?.trim() || void 0;
+function normalizeSearchText(value) {
+  const normalized = value?.trim();
+  return normalized ? normalized : void 0;
 }
-function y(e) {
-	let t = typeof e == "string" ? { addressQuery: e } : e, n = v(t.addressQuery), r = v(t.prefCode), i = v(t.prefName), a = v(t.prefKana), o = v(t.prefRoma), s = v(t.cityCode), c = v(t.cityName), l = v(t.cityKana), u = v(t.cityRoma), d = v(t.townName), f = v(t.townKana), p = v(t.townRoma);
-	return n === void 0 && r === void 0 && i === void 0 && a === void 0 && o === void 0 && s === void 0 && c === void 0 && l === void 0 && u === void 0 && d === void 0 && f === void 0 && p === void 0 ? null : {
-		...n === void 0 ? {} : { addressQuery: n },
-		...r === void 0 ? {} : { prefCode: r },
-		...i === void 0 ? {} : { prefName: i },
-		...a === void 0 ? {} : { prefKana: a },
-		...o === void 0 ? {} : { prefRoma: o },
-		...s === void 0 ? {} : { cityCode: s },
-		...c === void 0 ? {} : { cityName: c },
-		...l === void 0 ? {} : { cityKana: l },
-		...u === void 0 ? {} : { cityRoma: u },
-		...d === void 0 ? {} : { townName: d },
-		...f === void 0 ? {} : { townKana: f },
-		...p === void 0 ? {} : { townRoma: p },
-		pageNumber: t.pageNumber ?? 0,
-		rowsPerPage: t.rowsPerPage ?? 100,
-		...t.includeCityDetails === void 0 ? {} : { includeCityDetails: t.includeCityDetails },
-		...t.includePrefectureDetails === void 0 ? {} : { includePrefectureDetails: t.includePrefectureDetails }
-	};
+function normalizeAddressSearchInput(input) {
+  const request = typeof input === "string" ? { addressQuery: input } : input;
+  const addressQuery = normalizeSearchText(request.addressQuery);
+  const prefCode = normalizeSearchText(request.prefCode);
+  const prefName = normalizeSearchText(request.prefName);
+  const prefKana = normalizeSearchText(request.prefKana);
+  const prefRoma = normalizeSearchText(request.prefRoma);
+  const cityCode = normalizeSearchText(request.cityCode);
+  const cityName = normalizeSearchText(request.cityName);
+  const cityKana = normalizeSearchText(request.cityKana);
+  const cityRoma = normalizeSearchText(request.cityRoma);
+  const townName = normalizeSearchText(request.townName);
+  const townKana = normalizeSearchText(request.townKana);
+  const townRoma = normalizeSearchText(request.townRoma);
+  if (addressQuery === void 0 && prefCode === void 0 && prefName === void 0 && prefKana === void 0 && prefRoma === void 0 && cityCode === void 0 && cityName === void 0 && cityKana === void 0 && cityRoma === void 0 && townName === void 0 && townKana === void 0 && townRoma === void 0) {
+    return null;
+  }
+  return {
+    ...addressQuery === void 0 ? {} : { addressQuery },
+    ...prefCode === void 0 ? {} : { prefCode },
+    ...prefName === void 0 ? {} : { prefName },
+    ...prefKana === void 0 ? {} : { prefKana },
+    ...prefRoma === void 0 ? {} : { prefRoma },
+    ...cityCode === void 0 ? {} : { cityCode },
+    ...cityName === void 0 ? {} : { cityName },
+    ...cityKana === void 0 ? {} : { cityKana },
+    ...cityRoma === void 0 ? {} : { cityRoma },
+    ...townName === void 0 ? {} : { townName },
+    ...townKana === void 0 ? {} : { townKana },
+    ...townRoma === void 0 ? {} : { townRoma },
+    pageNumber: request.pageNumber ?? 0,
+    rowsPerPage: request.rowsPerPage ?? 100,
+    ...request.includeCityDetails === void 0 ? {} : {
+      includeCityDetails: request.includeCityDetails
+    },
+    ...request.includePrefectureDetails === void 0 ? {} : {
+      includePrefectureDetails: request.includePrefectureDetails
+    }
+  };
 }
-function b(e) {
-	return e.aborted ? Promise.resolve(null) : new Promise((t) => {
-		let n = () => {
-			e.removeEventListener("abort", n), t(null);
-		};
-		e.addEventListener("abort", n, { once: !0 });
-	});
+function waitForAbort(signal) {
+  if (signal.aborted) {
+    return Promise.resolve(null);
+  }
+  return new Promise((resolve) => {
+    const onAbort = () => {
+      signal.removeEventListener("abort", onAbort);
+      resolve(null);
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
 }
-function x(i) {
-	let a = n(() => _(i.dataSource), [i.dataSource]), o = i.debounceMs ?? 0, s = r(null), c = r(null), { loading: l, data: u, error: f, beginRequest: p, setSuccess: m, setFailure: v, finishRequest: x, cancel: S, reset: C } = g(), w = e((e) => {
-		s.current !== null && (globalThis.clearTimeout(s.current), s.current = null), c.current?.(e), c.current = null;
-	}, []);
-	t(() => () => {
-		w(null);
-	}, [w]);
-	let T = e(() => {
-		w(null), C();
-	}, [w, C]), E = e(() => {
-		w(null), S();
-	}, [w, S]), D = e(async (e, t, n) => {
-		try {
-			let r = { signal: t }, i = a.searchAddress(n, r), o = await Promise.race([i, b(t)]);
-			return t.aborted || o === null ? null : (m(e, o), o);
-		} catch (n) {
-			return t.aborted ? null : v(e, h(n));
-		} finally {
-			x(e);
-		}
-	}, [
-		a,
-		x,
-		v,
-		m
-	]);
-	return {
-		loading: l,
-		data: u,
-		error: f,
-		cancel: E,
-		reset: T,
-		search: e((e) => {
-			let t = y(e), { requestId: n, signal: r } = p();
-			if (w(null), t === null) {
-				let e = v(n, d("invalid_query", "Address query is required"));
-				return x(n), Promise.resolve(e);
-			}
-			return o <= 0 ? new Promise((e) => {
-				c.current = e, D(n, r, t).then((t) => {
-					e(t), c.current === e && (c.current = null);
-				});
-			}) : new Promise((e) => {
-				c.current = e, s.current = globalThis.setTimeout(() => {
-					s.current = null;
-					let e = c.current;
-					c.current = null, D(n, r, t).then((t) => {
-						e?.(t);
-					});
-				}, o);
-			});
-		}, [
-			p,
-			w,
-			o,
-			D
-		])
-	};
+function useJapanAddressSearch(options) {
+  const dataSource = useMemo(
+    () => resolveAddressSearchDataSource(options.dataSource),
+    [options.dataSource]
+  );
+  const debounceMs = options.debounceMs ?? 0;
+  const timeoutRef = useRef(
+    null
+  );
+  const pendingResolveRef = useRef(null);
+  const {
+    loading,
+    data,
+    error,
+    beginRequest,
+    setSuccess,
+    setFailure,
+    finishRequest,
+    cancel: cancelRequestState,
+    reset: resetRequestState
+  } = useLatestRequestState();
+  const clearPendingDebounce = useCallback(
+    (result) => {
+      if (timeoutRef.current !== null) {
+        globalThis.clearTimeout(timeoutRef.current);
+        timeoutRef.current = null;
+      }
+      pendingResolveRef.current?.(result);
+      pendingResolveRef.current = null;
+    },
+    []
+  );
+  useEffect(() => {
+    return () => {
+      clearPendingDebounce(null);
+    };
+  }, [clearPendingDebounce]);
+  const reset = useCallback(() => {
+    clearPendingDebounce(null);
+    resetRequestState();
+  }, [clearPendingDebounce, resetRequestState]);
+  const cancel = useCallback(() => {
+    clearPendingDebounce(null);
+    cancelRequestState();
+  }, [clearPendingDebounce, cancelRequestState]);
+  const runSearch = useCallback(async (requestId, signal, request) => {
+    try {
+      const requestOptions = {
+        signal
+      };
+      const searchPromise = dataSource.searchAddress(
+        request,
+        requestOptions
+      );
+      const result = await Promise.race([
+        searchPromise,
+        waitForAbort(signal)
+      ]);
+      if (signal.aborted || result === null) {
+        return null;
+      }
+      setSuccess(requestId, result);
+      return result;
+    } catch (caughtError) {
+      if (signal.aborted) {
+        return null;
+      }
+      return setFailure(requestId, toJapanAddressError(caughtError));
+    } finally {
+      finishRequest(requestId);
+    }
+  }, [dataSource, finishRequest, setFailure, setSuccess]);
+  const search = useCallback((input) => {
+    const request = normalizeAddressSearchInput(input);
+    const { requestId, signal } = beginRequest();
+    clearPendingDebounce(null);
+    if (request === null) {
+      const result = setFailure(
+        requestId,
+        createJapanAddressError(
+          "invalid_query",
+          "Address query is required"
+        )
+      );
+      finishRequest(requestId);
+      return Promise.resolve(result);
+    }
+    if (debounceMs <= 0) {
+      return new Promise((resolve) => {
+        pendingResolveRef.current = resolve;
+        void runSearch(requestId, signal, request).then((result) => {
+          resolve(result);
+          if (pendingResolveRef.current === resolve) {
+            pendingResolveRef.current = null;
+          }
+        });
+      });
+    }
+    return new Promise((resolve) => {
+      pendingResolveRef.current = resolve;
+      timeoutRef.current = globalThis.setTimeout(() => {
+        timeoutRef.current = null;
+        const pendingResolve = pendingResolveRef.current;
+        pendingResolveRef.current = null;
+        void runSearch(requestId, signal, request).then((result) => {
+          pendingResolve?.(result);
+        });
+      }, debounceMs);
+    });
+  }, [beginRequest, clearPendingDebounce, debounceMs, runSearch]);
+  return {
+    loading,
+    data,
+    error,
+    cancel,
+    reset,
+    search
+  };
 }
-//#endregion
-//#region src/react/useJapanPostalCode.ts
-function S(e) {
-	if (e) return e;
-	throw Error("useJapanPostalCode requires options.dataSource");
+function resolvePostalCodeDataSource(dataSource) {
+  if (dataSource) {
+    return dataSource;
+  }
+  throw new Error("useJapanPostalCode requires options.dataSource");
 }
-function C(t) {
-	let r = n(() => S(t.dataSource), [t.dataSource]), { loading: i, data: a, error: o, beginRequest: s, setSuccess: l, setFailure: u, finishRequest: f, cancel: p, reset: m } = g();
-	return {
-		loading: i,
-		data: a,
-		error: o,
-		cancel: p,
-		reset: m,
-		search: e(async (e) => {
-			let { requestId: t, signal: n } = s();
-			try {
-				let i = typeof e == "string" ? { postalCode: e } : e, a = c(i.postalCode);
-				if (!/^\d{3,7}$/.test(a)) throw d("invalid_postal_code", "Postal code must contain between 3 and 7 digits");
-				let o = { signal: n }, s = {
-					postalCode: a,
-					pageNumber: i.pageNumber ?? 0,
-					rowsPerPage: i.rowsPerPage ?? 100,
-					...i.includeParenthesesTown === void 0 ? {} : { includeParenthesesTown: i.includeParenthesesTown }
-				}, u = await r.lookupPostalCode(s, o);
-				return n.aborted ? null : (l(t, u), u);
-			} catch (e) {
-				return n.aborted ? null : u(t, h(e));
-			} finally {
-				f(t);
-			}
-		}, [
-			s,
-			r,
-			f,
-			u,
-			l
-		])
-	};
+function useJapanPostalCode(options) {
+  const dataSource = useMemo(
+    () => resolvePostalCodeDataSource(options.dataSource),
+    [options.dataSource]
+  );
+  const {
+    loading,
+    data,
+    error,
+    beginRequest,
+    setSuccess,
+    setFailure,
+    finishRequest,
+    cancel,
+    reset
+  } = useLatestRequestState();
+  const search = useCallback(
+    async (input) => {
+      const { requestId, signal } = beginRequest();
+      try {
+        const requestInput = typeof input === "string" ? { postalCode: input } : input;
+        const postalCode = normalizeJapanPostalCode(requestInput.postalCode);
+        if (!/^\d{3,7}$/.test(postalCode)) {
+          throw createJapanAddressError(
+            "invalid_postal_code",
+            "Postal code must contain between 3 and 7 digits"
+          );
+        }
+        const requestOptions = {
+          signal
+        };
+        const request = {
+          postalCode,
+          pageNumber: requestInput.pageNumber ?? 0,
+          rowsPerPage: requestInput.rowsPerPage ?? 100,
+          ...requestInput.includeParenthesesTown === void 0 ? {} : {
+            includeParenthesesTown: requestInput.includeParenthesesTown
+          }
+        };
+        const result = await dataSource.lookupPostalCode(
+          request,
+          requestOptions
+        );
+        if (signal.aborted) {
+          return null;
+        }
+        setSuccess(requestId, result);
+        return result;
+      } catch (caughtError) {
+        if (signal.aborted) {
+          return null;
+        }
+        return setFailure(requestId, toJapanAddressError(caughtError));
+      } finally {
+        finishRequest(requestId);
+      }
+    },
+    [beginRequest, dataSource, finishRequest, setFailure, setSuccess]
+  );
+  return {
+    loading,
+    data,
+    error,
+    cancel,
+    reset,
+    search
+  };
 }
-//#endregion
-//#region src/react/useJapanAddress.ts
-function w(t) {
-	let r = n(() => {
-		if (t.dataSource) return t.dataSource;
-		throw Error("useJapanAddress requires options.dataSource");
-	}, [t.dataSource]), a = C({ dataSource: r }), o = x({
-		dataSource: r,
-		debounceMs: t.debounceMs
-	}), s = a.reset, c = a.search, l = o.reset, u = o.search, [d, f] = i(null), p = e(async (e) => (l(), f("postalCode"), c(e)), [l, c]), m = e(async (e) => (s(), f("addressQuery"), u(e)), [s, u]), h = e(() => {
-		s(), l(), f(null);
-	}, [l, s]), g = d === "postalCode" ? a.data : d === "addressQuery" ? o.data : null, _ = d === "postalCode" ? a.error : d === "addressQuery" ? o.error : null;
-	return {
-		loading: a.loading || o.loading,
-		data: g,
-		error: _,
-		reset: h,
-		searchByPostalCode: p,
-		searchByAddressQuery: m
-	};
+
+// src/react/useJapanAddress.ts
+function useJapanAddress(options) {
+  const dataSource = useMemo(() => {
+    if (options.dataSource) {
+      return options.dataSource;
+    }
+    throw new Error("useJapanAddress requires options.dataSource");
+  }, [options.dataSource]);
+  const postalCode = useJapanPostalCode({ dataSource });
+  const addressSearch = useJapanAddressSearch({
+    dataSource,
+    debounceMs: options.debounceMs
+  });
+  const resetPostalCode = postalCode.reset;
+  const searchPostalCode = postalCode.search;
+  const resetAddressSearch = addressSearch.reset;
+  const searchAddressKeyword = addressSearch.search;
+  const [activeSearch, setActiveSearch] = useState(null);
+  const searchByPostalCode = useCallback(async (input) => {
+    resetAddressSearch();
+    setActiveSearch("postalCode");
+    return searchPostalCode(input);
+  }, [resetAddressSearch, searchPostalCode]);
+  const searchByAddressQuery = useCallback(async (input) => {
+    resetPostalCode();
+    setActiveSearch("addressQuery");
+    return searchAddressKeyword(input);
+  }, [resetPostalCode, searchAddressKeyword]);
+  const reset = useCallback(() => {
+    resetPostalCode();
+    resetAddressSearch();
+    setActiveSearch(null);
+  }, [resetAddressSearch, resetPostalCode]);
+  const data = activeSearch === "postalCode" ? postalCode.data : activeSearch === "addressQuery" ? addressSearch.data : null;
+  const error = activeSearch === "postalCode" ? postalCode.error : activeSearch === "addressQuery" ? addressSearch.error : null;
+  return {
+    // 사용자는 현재 활성 모드만 보더라도, 내부에서는 두 훅 중 하나라도 정리 중이면 로딩으로 본다.
+    loading: postalCode.loading || addressSearch.loading,
+    data,
+    error,
+    reset,
+    searchByPostalCode,
+    searchByAddressQuery
+  };
 }
-//#endregion
-export { s as AddressSearchInput, u as PostalCodeInput, d as createJapanAddressError, l as formatJapanPostalCode, m as isValidJapanPostalCode, p as normalizeJapanPostAddressRecord, c as normalizeJapanPostalCode, w as useJapanAddress, x as useJapanAddressSearch, C as useJapanPostalCode };
+
+export { AddressSearchInput, PostalCodeInput, createJapanAddressError, formatJapanPostalCode, isValidJapanPostalCode, normalizeJapanPostAddressRecord, normalizeJapanPostalCode, useJapanAddress, useJapanAddressSearch, useJapanPostalCode };