@farm.js/core 0.1.0-beta.95 → 0.1.0-beta.97

package/dist/plugin.d.mts

@@ -1,5 +1,5 @@
-export { Z as PluginRoutes, P as PluginRoutesFactory, W as RouteDefinition } from './route-Cq3aObmj.mjs';
-export { bs as APIHandlerLifecyclePayload, bo as APIRouteDiscoveredPayload, bv as BundleLifecyclePayload, B as BundleResultPayload, bt as ErrorLifecyclePayload, ec as FARM_NODE_RESPONSE_END_PENDING, a as FarmPlugin, bi as FarmPluginBuildHooks, bk as FarmPluginClientConfig, aX as FarmPluginContext, bj as FarmPluginDevHooks, bf as FarmPluginDiscoveredRoute, aY as FarmPluginIntegrationContext, aZ as FarmPluginLifecycle, bh as FarmPluginRenderHooks, b1 as FarmPluginRouteRuntimePayload, bg as FarmPluginRouterHooks, b7 as FarmPluginRuntimeAfterEvent, b4 as FarmPluginRuntimeBaseEvent, b6 as FarmPluginRuntimeBeforeEvent, ba as FarmPluginRuntimeCloseEvent, b5 as FarmPluginRuntimeContextEvent, b8 as FarmPluginRuntimeErrorEvent, bb as FarmPluginRuntimeHooks, b0 as FarmPluginRuntimeKind, bd as FarmPluginRuntimeRequestHandler, bc as FarmPluginRuntimeRequestOptions, be as FarmPluginRuntimeSession, b9 as FarmPluginRuntimeStartEvent, b2 as FarmPluginSetupContext, b3 as FarmPluginStateContext, a_ as FarmRequestPluginContext, a$ as FarmRequestStore, aw as FarmRuntimeShutdownError, bu as HMRUpdatePayload, bn as MiddlewareDiscoveredPayload, bw as NitroBuildLifecyclePayload, ax as PluginManager, aW as PluginRequestContext, br as RenderLifecyclePayload, bl as RouteDiscoveredPayload, bp as RouteMatchPayload, bq as RouteMatchResultPayload, bm as RoutesGeneratedPayload, bx as ShutdownPayload, av as definePlugin, s as farmPlugin } from './client-plugins-BvClItiL.mjs';
+export { Z as PluginRoutes, P as PluginRoutesFactory, W as RouteDefinition } from './route-CvEr4Uc9.mjs';
+export { bq as APIHandlerLifecyclePayload, bm as APIRouteDiscoveredPayload, bt as BundleLifecyclePayload, B as BundleResultPayload, br as ErrorLifecyclePayload, e4 as FARM_NODE_RESPONSE_END_PENDING, a as FarmPlugin, bg as FarmPluginBuildHooks, bi as FarmPluginClientConfig, aV as FarmPluginContext, bh as FarmPluginDevHooks, bd as FarmPluginDiscoveredRoute, aW as FarmPluginIntegrationContext, aX as FarmPluginLifecycle, bf as FarmPluginRenderHooks, a$ as FarmPluginRouteRuntimePayload, be as FarmPluginRouterHooks, b5 as FarmPluginRuntimeAfterEvent, b2 as FarmPluginRuntimeBaseEvent, b4 as FarmPluginRuntimeBeforeEvent, b8 as FarmPluginRuntimeCloseEvent, b3 as FarmPluginRuntimeContextEvent, b6 as FarmPluginRuntimeErrorEvent, b9 as FarmPluginRuntimeHooks, a_ as FarmPluginRuntimeKind, bb as FarmPluginRuntimeRequestHandler, ba as FarmPluginRuntimeRequestOptions, bc as FarmPluginRuntimeSession, b7 as FarmPluginRuntimeStartEvent, b0 as FarmPluginSetupContext, b1 as FarmPluginStateContext, aY as FarmRequestPluginContext, aZ as FarmRequestStore, au as FarmRuntimeShutdownError, bs as HMRUpdatePayload, bl as MiddlewareDiscoveredPayload, bu as NitroBuildLifecyclePayload, av as PluginManager, aU as PluginRequestContext, bp as RenderLifecyclePayload, bj as RouteDiscoveredPayload, bn as RouteMatchPayload, bo as RouteMatchResultPayload, bk as RoutesGeneratedPayload, bv as ShutdownPayload, at as definePlugin, s as farmPlugin } from './client-plugins-B6-07YmP.mjs';
 import 'vite';
 import './lifecycle-De0vQG45.mjs';
 import './env.mjs';
@@ -10,6 +10,7 @@ import './types-Cc8l9IqS.mjs';
 import 'db0';
 import 'unstorage';
 import 'react';
+import './integration-api-BT024nuJ.mjs';
 import '@farming-labs/orm';
 import './types-CKwggz9n.mjs';
 import '@farming-labs/docs';

package/dist/plugin.d.ts

@@ -1,5 +1,5 @@
-export { Z as PluginRoutes, P as PluginRoutesFactory, W as RouteDefinition } from './route-Y8lfz1wF.js';
-export { bs as APIHandlerLifecyclePayload, bo as APIRouteDiscoveredPayload, bv as BundleLifecyclePayload, B as BundleResultPayload, bt as ErrorLifecyclePayload, ec as FARM_NODE_RESPONSE_END_PENDING, a as FarmPlugin, bi as FarmPluginBuildHooks, bk as FarmPluginClientConfig, aX as FarmPluginContext, bj as FarmPluginDevHooks, bf as FarmPluginDiscoveredRoute, aY as FarmPluginIntegrationContext, aZ as FarmPluginLifecycle, bh as FarmPluginRenderHooks, b1 as FarmPluginRouteRuntimePayload, bg as FarmPluginRouterHooks, b7 as FarmPluginRuntimeAfterEvent, b4 as FarmPluginRuntimeBaseEvent, b6 as FarmPluginRuntimeBeforeEvent, ba as FarmPluginRuntimeCloseEvent, b5 as FarmPluginRuntimeContextEvent, b8 as FarmPluginRuntimeErrorEvent, bb as FarmPluginRuntimeHooks, b0 as FarmPluginRuntimeKind, bd as FarmPluginRuntimeRequestHandler, bc as FarmPluginRuntimeRequestOptions, be as FarmPluginRuntimeSession, b9 as FarmPluginRuntimeStartEvent, b2 as FarmPluginSetupContext, b3 as FarmPluginStateContext, a_ as FarmRequestPluginContext, a$ as FarmRequestStore, aw as FarmRuntimeShutdownError, bu as HMRUpdatePayload, bn as MiddlewareDiscoveredPayload, bw as NitroBuildLifecyclePayload, ax as PluginManager, aW as PluginRequestContext, br as RenderLifecyclePayload, bl as RouteDiscoveredPayload, bp as RouteMatchPayload, bq as RouteMatchResultPayload, bm as RoutesGeneratedPayload, bx as ShutdownPayload, av as definePlugin, s as farmPlugin } from './client-plugins-B9Sq-iMg.js';
+export { Z as PluginRoutes, P as PluginRoutesFactory, W as RouteDefinition } from './route-4pd-EVtw.js';
+export { bq as APIHandlerLifecyclePayload, bm as APIRouteDiscoveredPayload, bt as BundleLifecyclePayload, B as BundleResultPayload, br as ErrorLifecyclePayload, e4 as FARM_NODE_RESPONSE_END_PENDING, a as FarmPlugin, bg as FarmPluginBuildHooks, bi as FarmPluginClientConfig, aV as FarmPluginContext, bh as FarmPluginDevHooks, bd as FarmPluginDiscoveredRoute, aW as FarmPluginIntegrationContext, aX as FarmPluginLifecycle, bf as FarmPluginRenderHooks, a$ as FarmPluginRouteRuntimePayload, be as FarmPluginRouterHooks, b5 as FarmPluginRuntimeAfterEvent, b2 as FarmPluginRuntimeBaseEvent, b4 as FarmPluginRuntimeBeforeEvent, b8 as FarmPluginRuntimeCloseEvent, b3 as FarmPluginRuntimeContextEvent, b6 as FarmPluginRuntimeErrorEvent, b9 as FarmPluginRuntimeHooks, a_ as FarmPluginRuntimeKind, bb as FarmPluginRuntimeRequestHandler, ba as FarmPluginRuntimeRequestOptions, bc as FarmPluginRuntimeSession, b7 as FarmPluginRuntimeStartEvent, b0 as FarmPluginSetupContext, b1 as FarmPluginStateContext, aY as FarmRequestPluginContext, aZ as FarmRequestStore, au as FarmRuntimeShutdownError, bs as HMRUpdatePayload, bl as MiddlewareDiscoveredPayload, bu as NitroBuildLifecyclePayload, av as PluginManager, aU as PluginRequestContext, bp as RenderLifecyclePayload, bj as RouteDiscoveredPayload, bn as RouteMatchPayload, bo as RouteMatchResultPayload, bk as RoutesGeneratedPayload, bv as ShutdownPayload, at as definePlugin, s as farmPlugin } from './client-plugins-By6MVUX-.js';
 import 'vite';
 import './lifecycle-De0vQG45.js';
 import './env.js';
@@ -10,6 +10,7 @@ import './types-Cc8l9IqS.js';
 import 'db0';
 import 'unstorage';
 import 'react';
+import './integration-api-BT024nuJ.js';
 import '@farming-labs/orm';
 import './types-CKwggz9n.js';
 import '@farming-labs/docs';

package/dist/plugin.mjs

@@ -4,7 +4,7 @@ import {
   PluginManager,
   definePlugin,
   farmPlugin
-} from "./chunk-A3636IHN.mjs";
+} from "./chunk-FP5Q67FO.mjs";
 import "./chunk-YVPFZ2TK.mjs";
 import "./chunk-KDP5ZSWP.mjs";
 import "./chunk-WQDQCTC5.mjs";
@@ -16,7 +16,7 @@ import "./chunk-USWZZUEH.mjs";
 import "./chunk-USLFXFFH.mjs";
 import "./chunk-CG4GPK3Z.mjs";
 import "./chunk-YKAUAZA4.mjs";
-import "./chunk-7MABZJIM.mjs";
+import "./chunk-7PYVLJ4J.mjs";
 import "./chunk-7T2QYWDH.mjs";
 import "./chunk-5EZRXIFH.mjs";
 import "./chunk-7ZVN3YZI.mjs";
@@ -27,19 +27,19 @@ import "./chunk-A5VG2BDG.mjs";
 import "./chunk-EUYRVVXL.mjs";
 import "./chunk-2SKCXYLB.mjs";
 import "./chunk-BZAIS65C.mjs";
-import "./chunk-VV24CC42.mjs";
+import "./chunk-35NPLKQJ.mjs";
 import "./chunk-N2KC75H7.mjs";
 import "./chunk-H53KVQUU.mjs";
 import "./chunk-QKVUNGAH.mjs";
 import "./chunk-AAC66ILR.mjs";
 import "./chunk-ISSFLGJ5.mjs";
-import "./chunk-RWYRFCLG.mjs";
+import "./chunk-4X57GXQA.mjs";
 import "./chunk-IGOLMCE3.mjs";
 import "./chunk-YUE4CJNB.mjs";
-import "./chunk-ZFNK77WN.mjs";
-import "./chunk-MH27UH72.mjs";
+import "./chunk-6JNGOC37.mjs";
+import "./chunk-TT3E2JOF.mjs";
 import "./chunk-NXV52RNX.mjs";
-import "./chunk-WB75GIX2.mjs";
+import "./chunk-TQTB33JS.mjs";
 import "./chunk-STV7A2LH.mjs";
 import "./chunk-XNWHZQ6A.mjs";
 import "./chunk-SXWF4QRU.mjs";
@@ -48,7 +48,7 @@ import "./chunk-LBRRZEEK.mjs";
 import "./chunk-HAG2HEDU.mjs";
 import "./chunk-VFPFBYG5.mjs";
 import "./chunk-35SSRS5K.mjs";
-import "./chunk-D7QH7MDU.mjs";
+import "./chunk-3TWQERDE.mjs";
 import "./chunk-4OAR7CTF.mjs";
 import "./chunk-O2IGROSM.mjs";
 import "./chunk-4N7DAFLY.mjs";
@@ -57,17 +57,17 @@ import "./chunk-RCNUKRBF.mjs";
 import "./chunk-GQVQESLY.mjs";
 import "./chunk-HKXMMPYI.mjs";
 import "./chunk-YECMFULZ.mjs";
-import "./chunk-XTLLHCWU.mjs";
+import "./chunk-V4VRLVLW.mjs";
 import "./chunk-6YPPIPKR.mjs";
 import "./chunk-776TTMU3.mjs";
 import "./chunk-3BXGOVKE.mjs";
 import "./chunk-4C3Z34O7.mjs";
-import "./chunk-AXVJCMVF.mjs";
-import "./chunk-RBRLLZL5.mjs";
+import "./chunk-2HDOV47R.mjs";
+import "./chunk-34IAPZBG.mjs";
 import "./chunk-WZ5QFROO.mjs";
-import "./chunk-ZRBCBOEX.mjs";
+import "./chunk-N2FY2QZ7.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-22VG4DFJ.mjs";
+import "./chunk-J3MPQ4MQ.mjs";
 import "./chunk-PHN22XB2.mjs";
 import "./chunk-XYTDSPBD.mjs";
 import "./chunk-OMQWEX4N.mjs";

package/dist/{production-runtime-IkB0Qj4i.d.mts → production-runtime-BGRH1dKG.d.mts}

@@ -1,4 +1,4 @@
-import { ad as ReadonlyMiddlewareStore, ae as FarmMiddlewareConfig, af as MiddlewareModule } from './client-plugins-BvClItiL.mjs';
+import { ad as ReadonlyMiddlewareStore, ae as FarmMiddlewareConfig, af as MiddlewareModule } from './client-plugins-B6-07YmP.mjs';
 import { R as ResolvedFarmI18nConfig } from './types-CnH8DOqo.mjs';
 import { R as ResolvedFarmServerConfig } from './workflows-ChyK_oTu.mjs';
 

package/dist/{production-runtime-0JTch4_d.d.ts → production-runtime-CdmzsDax.d.ts}

@@ -1,4 +1,4 @@
-import { ad as ReadonlyMiddlewareStore, ae as FarmMiddlewareConfig, af as MiddlewareModule } from './client-plugins-B9Sq-iMg.js';
+import { ad as ReadonlyMiddlewareStore, ae as FarmMiddlewareConfig, af as MiddlewareModule } from './client-plugins-By6MVUX-.js';
 import { R as ResolvedFarmI18nConfig } from './types-CnH8DOqo.js';
 import { R as ResolvedFarmServerConfig } from './workflows-ChyK_oTu.js';
 

package/dist/query/client.cjs

@@ -457,7 +457,14 @@ __name(createParser, "createParser");
 
 // src/query/client.ts
 var getCurrentSearchParams = /* @__PURE__ */ __name(() => {
-  if (typeof window !== "undefined") return new URLSearchParams(window.location.search);
+  if (typeof window !== "undefined") {
+    discardDepartedURLUpdates();
+    let params = new URLSearchParams(window.location.search);
+    for (const pending of throttleTimers.values()) {
+      if (pending.href === window.location.href) params = applyChange(params, pending.updates);
+    }
+    return params;
+  }
   const request = _resolveCurrentRequest();
   if (!request) return new URLSearchParams();
   try {
@@ -471,10 +478,28 @@ var readSearchParam = /* @__PURE__ */ __name((searchParams, key) => {
   return values.length > 1 ? values.join(",") : values[0] ?? "";
 }, "readSearchParam");
 var throttleTimers = /* @__PURE__ */ new Map();
+function discardDepartedURLUpdates() {
+  for (const [key, pending] of throttleTimers) {
+    if (pending.href === window.location.href) continue;
+    clearTimeout(pending.timer);
+    throttleTimers.delete(key);
+  }
+}
+__name(discardDepartedURLUpdates, "discardDepartedURLUpdates");
 function getUpdateKey(updates) {
   return JSON.stringify(Object.keys(updates).sort());
 }
 __name(getUpdateKey, "getUpdateKey");
+function supersedeQueuedKeys(updates) {
+  const keys = Object.keys(updates);
+  for (const [queueKey, pending] of throttleTimers) {
+    for (const key of keys) delete pending.updates[key];
+    if (Object.keys(pending.updates).length > 0) continue;
+    clearTimeout(pending.timer);
+    throttleTimers.delete(queueKey);
+  }
+}
+__name(supersedeQueuedKeys, "supersedeQueuedKeys");
 var compareStructuredValues = /* @__PURE__ */ __name((current, next, seen = /* @__PURE__ */ new WeakMap()) => {
   if (Object.is(current, next)) return true;
   if (current === null || next === null || typeof current !== typeof next) return false;
@@ -554,8 +579,10 @@ var commitURLUpdate = /* @__PURE__ */ __name((updates, options, emitUpdate) => {
     window.history[history](nextHistoryState, "", newUrl);
   }
   if (emitUpdate) {
-    const actualSearchParams = new URLSearchParams(window.location.search);
-    emitter.emitUpdate(actualSearchParams);
+    for (const pending of throttleTimers.values()) {
+      if (pending.href === url.href) pending.href = window.location.href;
+    }
+    emitter.emitUpdate(getCurrentSearchParams());
   }
   if (shallow) notifyHistoryChange("url-search");
   if (scroll) {
@@ -564,31 +591,30 @@ var commitURLUpdate = /* @__PURE__ */ __name((updates, options, emitUpdate) => {
 }, "commitURLUpdate");
 var updateURL = /* @__PURE__ */ __name((updates, options = {}, emitUpdate = true) => {
   if (typeof window === "undefined") return;
+  discardDepartedURLUpdates();
   const { throttleMs } = options;
+  supersedeQueuedKeys(updates);
   if (!throttleMs || throttleMs <= 0) {
     commitURLUpdate(updates, options, emitUpdate);
     return;
   }
   const throttleKey = getUpdateKey(updates);
-  const existingTimeout = throttleTimers.get(throttleKey);
-  if (existingTimeout) {
-    clearTimeout(existingTimeout);
-    throttleTimers.delete(throttleKey);
-  }
   const currentUrl = new URL(window.location.href);
   const nextSearch = applyChange(currentUrl.searchParams, updates).toString();
   if (nextSearch === currentUrl.searchParams.toString()) return;
   const timeout = setTimeout(() => {
-    if (throttleTimers.get(throttleKey) === timeout) {
-      throttleTimers.delete(throttleKey);
-    }
+    const pending = throttleTimers.get(throttleKey);
+    if (pending?.timer !== timeout) return;
+    throttleTimers.delete(throttleKey);
+    if (pending.href !== window.location.href) return;
     commitURLUpdate(updates, options, emitUpdate);
   }, throttleMs);
-  throttleTimers.set(throttleKey, timeout);
+  throttleTimers.set(throttleKey, { timer: timeout, updates, href: currentUrl.href });
   return () => {
-    if (throttleTimers.get(throttleKey) !== timeout) return;
+    if (throttleTimers.get(throttleKey)?.timer !== timeout) return false;
     clearTimeout(timeout);
     throttleTimers.delete(throttleKey);
+    return true;
   };
 }, "updateURL");
 function useQueryState(key, parser, options) {
@@ -599,21 +625,16 @@ function useQueryState(key, parser, options) {
   });
   const stateRef = (0, import_react.useRef)(state);
   const stateKeyRef = (0, import_react.useRef)(key);
-  const isInternalUpdateRef = (0, import_react.useRef)(false);
   const cancelPendingUpdateRef = (0, import_react.useRef)(void 0);
   stateRef.current = state;
   const setValue = (0, import_react.useCallback)(
     (value) => {
-      isInternalUpdateRef.current = true;
       setState(value);
       stateRef.current = value;
       const serialized = value === null ? null : parser.serialize(value);
-      emitter.emitKey(key, { state: value, query: serialized });
+      emitter.emitKey(key, { state: value, query: serialized, source: stateRef });
       cancelPendingUpdateRef.current?.();
       cancelPendingUpdateRef.current = updateURL({ [key]: serialized }, options, true);
-      setTimeout(() => {
-        isInternalUpdateRef.current = false;
-      }, 10);
     },
     [key, parser, options]
   );
@@ -630,9 +651,6 @@ function useQueryState(key, parser, options) {
       }
     }, "onPopState");
     const onEmitterUpdate = /* @__PURE__ */ __name((searchParams) => {
-      if (isInternalUpdateRef.current) {
-        return;
-      }
       const parsed = parser.parse(readSearchParam(searchParams, key));
       if (!areParsedValuesEqual(parser, stateRef.current, parsed)) {
         setState(parsed);
@@ -640,12 +658,13 @@ function useQueryState(key, parser, options) {
       }
     }, "onEmitterUpdate");
     const onKeyUpdate = /* @__PURE__ */ __name((payload) => {
-      if (isInternalUpdateRef.current) {
+      if (payload.source === stateRef) {
         return;
       }
-      if (!areParsedValuesEqual(parser, stateRef.current, payload.state)) {
-        setState(payload.state);
-        stateRef.current = payload.state;
+      const parsed = parser.parse(payload.query ?? "");
+      if (!areParsedValuesEqual(parser, stateRef.current, parsed)) {
+        setState(parsed);
+        stateRef.current = parsed;
       }
     }, "onKeyUpdate");
     onPopState();
@@ -660,8 +679,11 @@ function useQueryState(key, parser, options) {
   }, [key, parser]);
   (0, import_react.useEffect)(
     () => () => {
-      cancelPendingUpdateRef.current?.();
+      const canceledPendingWrite = cancelPendingUpdateRef.current?.() ?? false;
       cancelPendingUpdateRef.current = void 0;
+      if (canceledPendingWrite && typeof window !== "undefined") {
+        emitter.emitUpdate(getCurrentSearchParams());
+      }
     },
     [key]
   );
@@ -691,7 +713,7 @@ function useQueryStates(parsers, options = {}) {
         const parser = parsers[key];
         if (parser) {
           const serialized = value === null ? null : parser.serialize(value);
-          emitter.emitKey(key, { state: value, query: serialized });
+          emitter.emitKey(key, { state: value, query: serialized, source: stateRef });
         }
       });
       const urlUpdates = {};
@@ -742,17 +764,34 @@ function useQueryStates(parsers, options = {}) {
     applyChange2(getCurrentSearchParams());
     const unsubscribeHistory = subscribeHistoryChange(onPopState);
     emitter.on("update", onEmitterUpdate);
+    const unsubscribeKeys = Object.entries(parsers).map(([key, parser]) => {
+      const onKeyUpdate = /* @__PURE__ */ __name((payload) => {
+        if (payload.source === stateRef) return;
+        const parsed = parser.parse(payload.query ?? "");
+        if (areParsedValuesEqual(parser, stateRef.current[key], parsed)) return;
+        const next = { ...stateRef.current, [key]: parsed };
+        stateRef.current = next;
+        setState(next);
+      }, "onKeyUpdate");
+      emitter.onKey(key, onKeyUpdate);
+      return () => emitter.offKey(key, onKeyUpdate);
+    });
     return () => {
       unsubscribeHistory();
       emitter.off("update", onEmitterUpdate);
+      for (const unsubscribe of unsubscribeKeys) unsubscribe();
     };
   }, [watchKeys, parsers]);
   (0, import_react.useEffect)(
     () => () => {
+      let canceledPendingWrite = false;
       for (const cancelPendingUpdate of pendingUpdatesRef.current.values()) {
-        cancelPendingUpdate();
+        if (cancelPendingUpdate()) canceledPendingWrite = true;
       }
       pendingUpdatesRef.current.clear();
+      if (canceledPendingWrite && typeof window !== "undefined") {
+        emitter.emitUpdate(getCurrentSearchParams());
+      }
     },
     [watchKeys]
   );

package/dist/query/client.mjs

@@ -17,7 +17,7 @@ import {
   notifyHistoryChange,
   subscribeHistoryChange,
   writeFarmURLSearchHistory
-} from "../chunk-MRVJCLYQ.mjs";
+} from "../chunk-PSQ7N4XP.mjs";
 import "../chunk-ULD4ENAH.mjs";
 import "../chunk-JIT7GXDP.mjs";
 import "../chunk-3BXGOVKE.mjs";
@@ -98,7 +98,14 @@ var emitter = new Emitter();
 
 // src/query/client.ts
 var getCurrentSearchParams = /* @__PURE__ */ __name(() => {
-  if (typeof window !== "undefined") return new URLSearchParams(window.location.search);
+  if (typeof window !== "undefined") {
+    discardDepartedURLUpdates();
+    let params = new URLSearchParams(window.location.search);
+    for (const pending of throttleTimers.values()) {
+      if (pending.href === window.location.href) params = applyChange(params, pending.updates);
+    }
+    return params;
+  }
   const request = _resolveCurrentRequest();
   if (!request) return new URLSearchParams();
   try {
@@ -112,10 +119,28 @@ var readSearchParam = /* @__PURE__ */ __name((searchParams, key) => {
   return values.length > 1 ? values.join(",") : values[0] ?? "";
 }, "readSearchParam");
 var throttleTimers = /* @__PURE__ */ new Map();
+function discardDepartedURLUpdates() {
+  for (const [key, pending] of throttleTimers) {
+    if (pending.href === window.location.href) continue;
+    clearTimeout(pending.timer);
+    throttleTimers.delete(key);
+  }
+}
+__name(discardDepartedURLUpdates, "discardDepartedURLUpdates");
 function getUpdateKey(updates) {
   return JSON.stringify(Object.keys(updates).sort());
 }
 __name(getUpdateKey, "getUpdateKey");
+function supersedeQueuedKeys(updates) {
+  const keys = Object.keys(updates);
+  for (const [queueKey, pending] of throttleTimers) {
+    for (const key of keys) delete pending.updates[key];
+    if (Object.keys(pending.updates).length > 0) continue;
+    clearTimeout(pending.timer);
+    throttleTimers.delete(queueKey);
+  }
+}
+__name(supersedeQueuedKeys, "supersedeQueuedKeys");
 var compareStructuredValues = /* @__PURE__ */ __name((current, next, seen = /* @__PURE__ */ new WeakMap()) => {
   if (Object.is(current, next)) return true;
   if (current === null || next === null || typeof current !== typeof next) return false;
@@ -195,8 +220,10 @@ var commitURLUpdate = /* @__PURE__ */ __name((updates, options, emitUpdate) => {
     window.history[history](nextHistoryState, "", newUrl);
   }
   if (emitUpdate) {
-    const actualSearchParams = new URLSearchParams(window.location.search);
-    emitter.emitUpdate(actualSearchParams);
+    for (const pending of throttleTimers.values()) {
+      if (pending.href === url.href) pending.href = window.location.href;
+    }
+    emitter.emitUpdate(getCurrentSearchParams());
   }
   if (shallow) notifyHistoryChange("url-search");
   if (scroll) {
@@ -205,31 +232,30 @@ var commitURLUpdate = /* @__PURE__ */ __name((updates, options, emitUpdate) => {
 }, "commitURLUpdate");
 var updateURL = /* @__PURE__ */ __name((updates, options = {}, emitUpdate = true) => {
   if (typeof window === "undefined") return;
+  discardDepartedURLUpdates();
   const { throttleMs } = options;
+  supersedeQueuedKeys(updates);
   if (!throttleMs || throttleMs <= 0) {
     commitURLUpdate(updates, options, emitUpdate);
     return;
   }
   const throttleKey = getUpdateKey(updates);
-  const existingTimeout = throttleTimers.get(throttleKey);
-  if (existingTimeout) {
-    clearTimeout(existingTimeout);
-    throttleTimers.delete(throttleKey);
-  }
   const currentUrl = new URL(window.location.href);
   const nextSearch = applyChange(currentUrl.searchParams, updates).toString();
   if (nextSearch === currentUrl.searchParams.toString()) return;
   const timeout = setTimeout(() => {
-    if (throttleTimers.get(throttleKey) === timeout) {
-      throttleTimers.delete(throttleKey);
-    }
+    const pending = throttleTimers.get(throttleKey);
+    if (pending?.timer !== timeout) return;
+    throttleTimers.delete(throttleKey);
+    if (pending.href !== window.location.href) return;
     commitURLUpdate(updates, options, emitUpdate);
   }, throttleMs);
-  throttleTimers.set(throttleKey, timeout);
+  throttleTimers.set(throttleKey, { timer: timeout, updates, href: currentUrl.href });
   return () => {
-    if (throttleTimers.get(throttleKey) !== timeout) return;
+    if (throttleTimers.get(throttleKey)?.timer !== timeout) return false;
     clearTimeout(timeout);
     throttleTimers.delete(throttleKey);
+    return true;
   };
 }, "updateURL");
 function useQueryState(key, parser, options) {
@@ -240,21 +266,16 @@ function useQueryState(key, parser, options) {
   });
   const stateRef = useRef(state);
   const stateKeyRef = useRef(key);
-  const isInternalUpdateRef = useRef(false);
   const cancelPendingUpdateRef = useRef(void 0);
   stateRef.current = state;
   const setValue = useCallback(
     (value) => {
-      isInternalUpdateRef.current = true;
       setState(value);
       stateRef.current = value;
       const serialized = value === null ? null : parser.serialize(value);
-      emitter.emitKey(key, { state: value, query: serialized });
+      emitter.emitKey(key, { state: value, query: serialized, source: stateRef });
       cancelPendingUpdateRef.current?.();
       cancelPendingUpdateRef.current = updateURL({ [key]: serialized }, options, true);
-      setTimeout(() => {
-        isInternalUpdateRef.current = false;
-      }, 10);
     },
     [key, parser, options]
   );
@@ -271,9 +292,6 @@ function useQueryState(key, parser, options) {
       }
     }, "onPopState");
     const onEmitterUpdate = /* @__PURE__ */ __name((searchParams) => {
-      if (isInternalUpdateRef.current) {
-        return;
-      }
       const parsed = parser.parse(readSearchParam(searchParams, key));
       if (!areParsedValuesEqual(parser, stateRef.current, parsed)) {
         setState(parsed);
@@ -281,12 +299,13 @@ function useQueryState(key, parser, options) {
       }
     }, "onEmitterUpdate");
     const onKeyUpdate = /* @__PURE__ */ __name((payload) => {
-      if (isInternalUpdateRef.current) {
+      if (payload.source === stateRef) {
         return;
       }
-      if (!areParsedValuesEqual(parser, stateRef.current, payload.state)) {
-        setState(payload.state);
-        stateRef.current = payload.state;
+      const parsed = parser.parse(payload.query ?? "");
+      if (!areParsedValuesEqual(parser, stateRef.current, parsed)) {
+        setState(parsed);
+        stateRef.current = parsed;
       }
     }, "onKeyUpdate");
     onPopState();
@@ -301,8 +320,11 @@ function useQueryState(key, parser, options) {
   }, [key, parser]);
   useEffect(
     () => () => {
-      cancelPendingUpdateRef.current?.();
+      const canceledPendingWrite = cancelPendingUpdateRef.current?.() ?? false;
       cancelPendingUpdateRef.current = void 0;
+      if (canceledPendingWrite && typeof window !== "undefined") {
+        emitter.emitUpdate(getCurrentSearchParams());
+      }
     },
     [key]
   );
@@ -332,7 +354,7 @@ function useQueryStates(parsers, options = {}) {
         const parser = parsers[key];
         if (parser) {
           const serialized = value === null ? null : parser.serialize(value);
-          emitter.emitKey(key, { state: value, query: serialized });
+          emitter.emitKey(key, { state: value, query: serialized, source: stateRef });
         }
       });
       const urlUpdates = {};
@@ -383,17 +405,34 @@ function useQueryStates(parsers, options = {}) {
     applyChange2(getCurrentSearchParams());
     const unsubscribeHistory = subscribeHistoryChange(onPopState);
     emitter.on("update", onEmitterUpdate);
+    const unsubscribeKeys = Object.entries(parsers).map(([key, parser]) => {
+      const onKeyUpdate = /* @__PURE__ */ __name((payload) => {
+        if (payload.source === stateRef) return;
+        const parsed = parser.parse(payload.query ?? "");
+        if (areParsedValuesEqual(parser, stateRef.current[key], parsed)) return;
+        const next = { ...stateRef.current, [key]: parsed };
+        stateRef.current = next;
+        setState(next);
+      }, "onKeyUpdate");
+      emitter.onKey(key, onKeyUpdate);
+      return () => emitter.offKey(key, onKeyUpdate);
+    });
     return () => {
       unsubscribeHistory();
       emitter.off("update", onEmitterUpdate);
+      for (const unsubscribe of unsubscribeKeys) unsubscribe();
     };
   }, [watchKeys, parsers]);
   useEffect(
     () => () => {
+      let canceledPendingWrite = false;
       for (const cancelPendingUpdate of pendingUpdatesRef.current.values()) {
-        cancelPendingUpdate();
+        if (cancelPendingUpdate()) canceledPendingWrite = true;
       }
       pendingUpdatesRef.current.clear();
+      if (canceledPendingWrite && typeof window !== "undefined") {
+        emitter.emitUpdate(getCurrentSearchParams());
+      }
     },
     [watchKeys]
   );