@rpcbase/client 0.379.0 → 0.381.0

package/dist/apiClient/getServerApiClient.d.ts

@@ -1,5 +1,5 @@
 import { Application } from 'express';
-type Ctx = any;
+import { Ctx } from '@rpcbase/api';
 export declare const getServerApiClient: (app: Application) => Promise<{
     get: <TResponse = Record<string, unknown>>(path: string, payload: Record<string, unknown>, ctx?: Ctx) => Promise<TResponse>;
     post: <TResponse = Record<string, unknown>>(path: string, payload: Record<string, unknown>, ctx?: Ctx) => Promise<TResponse>;

package/dist/apiClient/getServerApiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServerApiClient.d.ts","sourceRoot":"","sources":["../../src/apiClient/getServerApiClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA8B,MAAM,SAAS,CAAA;AAGjE,KAAK,GAAG,GAAG,GAAG,CAAA;AAGd,eAAO,MAAM,kBAAkB,GAAS,KAAK,WAAW;UA+KtC,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;WAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;UAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;aAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;EAyBxB,CAAA;AAED,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"getServerApiClient.d.ts","sourceRoot":"","sources":["../../src/apiClient/getServerApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA8B,MAAM,SAAS,CAAA;AACjE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAkBvC,eAAO,MAAM,kBAAkB,GAAS,KAAK,WAAW;UA+KtC,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;WAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;UAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;aAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;EAyBxB,CAAA;AAED,eAAe,kBAAkB,CAAA"}

package/dist/getServerApiClient-BYu8h5Zd.js.map

@@ -1 +1 @@
-{"version":3,"file":"getServerApiClient-BYu8h5Zd.js","sources":["../src/apiClient/getServerApiClient.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { Application, IRouter, Request, Response } from \"express\"\n\n// import { Ctx } from \"@rpcbase/api\"\ntype Ctx = any\n\n\nexport const getServerApiClient = async(app: Application) => {\n  const callRoute = async <TResponse = Record<string, unknown>>(\n    app: Application,\n    method: string,\n    matchPath: string,\n    requestUrl: string,\n    req: Partial<Request>,\n    res: Partial<Response>\n  ): Promise<TResponse> => {\n    return new Promise((resolve, reject) => {\n      let isEnded = false\n      let timeoutId: ReturnType<typeof setTimeout> | null = null\n\n      const resolveRequest = (data: TResponse) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        resolve(data)\n      }\n\n      const rejectRequest = (error: unknown) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        reject(error)\n      }\n\n      const mockReq = {\n        ...req,\n        method: method.toUpperCase(),\n        url: requestUrl\n      } as Request\n\n      const mockRes = {\n        ...res,\n        json: (data: any) => {\n          resolveRequest(data)\n        },\n        status: (statusCode: number) => {\n          console.log(\"Status:\", statusCode, mockReq.method, mockReq.url)\n          return mockRes\n        },\n      } as Response\n\n      const routerStack: any[] = (app.router as unknown as IRouter).stack\n\n      const firstApiMiddlewareIndex = routerStack.findIndex((layer) => layer.name === \"__FIRST_API_MIDDLEWARE__\")\n      if (!(firstApiMiddlewareIndex > -1)) {\n        throw new Error(\"middleware: __FIRST_API_MIDDLEWARE__ was not found in stack\")\n      }\n\n      const apiStack = routerStack.slice(firstApiMiddlewareIndex + 1)\n\n      const processLayer = async (index: number) => {\n        if (index >= apiStack.length || isEnded) return\n\n        const layer = apiStack[index]\n\n        const isNonMatchingLayer = !layer.match(matchPath)\n        if (isNonMatchingLayer) {\n          // console.log(\"not machthing route:\", matchPath, \"to layer:\", index, layer.name, layer, \"reason: \", {isNonMatchingLayer})\n          await processLayer(index + 1)\n          return\n        }\n\n        const runHandler = async(handler: any) => new Promise<void>((resolveMiddleware, rejectMiddleware) => {\n          handler(mockReq, mockRes, (err?: any) => {\n            if (err) {\n              console.error(\"Middleware error:\", err)\n              rejectMiddleware(err)\n              return\n            }\n            resolveMiddleware()\n          })\n        })\n\n        if (layer.route) {\n          if (!layer.route.methods[method.toLowerCase()]) {\n            // console.log(\"not machthing route:\", matchPath, \"to route layer:\", index, layer.name, layer, \"reason: method not matching\")\n            await processLayer(index + 1)\n            return\n          }\n\n          if (layer.route.stack.length !== 1) {\n            throw new Error(`expected only one handler per route for route: ${layer.route.path}`)\n          }\n\n          await runHandler(layer.route.stack[0].handle)\n\n        } else {\n          await runHandler(layer.handle)\n        }\n\n        if (!isEnded) {\n          await processLayer(index + 1)\n        }\n      }\n\n      void processLayer(0).catch((err) => {\n        rejectRequest(err)\n      })\n\n      // Set a timeout to prevent hanging\n      timeoutId = setTimeout(() => {\n        rejectRequest(new Error(\"Route handler timed out\"))\n      }, 30000)\n    })\n  }\n\n  const mergeQueryValues = (target: Record<string, string | string[]>, key: string, value: string) => {\n    const existing = target[key]\n    if (Array.isArray(existing)) {\n      existing.push(value)\n      return\n    }\n\n    if (typeof existing === \"string\") {\n      target[key] = [existing, value]\n      return\n    }\n\n    target[key] = value\n  }\n\n  const toQueryValue = (value: unknown): string | null => {\n    if (typeof value === \"string\") return value\n    if (typeof value === \"number\") return Number.isFinite(value) ? String(value) : null\n    if (typeof value === \"boolean\") return value ? \"true\" : \"false\"\n    if (typeof value === \"bigint\") return String(value)\n    if (value instanceof Date) return value.toISOString()\n    return null\n  }\n\n  const buildQuery = (path: string, payload: Record<string, unknown>) => {\n    const url = new URL(path, \"http://localhost\")\n\n    const query: Record<string, string | string[]> = {}\n    for (const [key, value] of url.searchParams) {\n      mergeQueryValues(query, key, value)\n    }\n\n    for (const [key, rawValue] of Object.entries(payload)) {\n      if (!key) continue\n\n      if (Array.isArray(rawValue)) {\n        for (const item of rawValue) {\n          const converted = toQueryValue(item)\n          if (converted !== null) mergeQueryValues(query, key, converted)\n        }\n        continue\n      }\n\n      const converted = toQueryValue(rawValue)\n      if (converted !== null) mergeQueryValues(query, key, converted)\n    }\n\n    const searchParams = new URLSearchParams()\n    for (const [key, rawValue] of Object.entries(query)) {\n      if (Array.isArray(rawValue)) {\n        for (const value of rawValue) {\n          searchParams.append(key, value)\n        }\n        continue\n      }\n\n      searchParams.append(key, rawValue)\n    }\n\n    const matchPath = url.pathname\n    const requestUrl = `${matchPath}${searchParams.toString() ? `?${searchParams.toString()}` : \"\"}`\n\n    return { matchPath, requestUrl, query }\n  }\n\n  const createMethod = (method: string) => {\n    return async <TResponse = Record<string, unknown>>(\n      path: string,\n      payload: Record<string, unknown>,\n      ctx?: Ctx,\n    ): Promise<TResponse> => {\n      if (!ctx) {\n        throw new Error(\"Context must be provided in SSR mode\")\n      }\n\n      const normalizedMethod = method.toLowerCase()\n\n      if (normalizedMethod === \"get\") {\n        const { matchPath, requestUrl, query } = buildQuery(path, payload)\n        return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: {}, query }, ctx.res)\n      }\n\n      const { matchPath, requestUrl, query } = buildQuery(path, {})\n      return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: payload, query }, ctx.res)\n    }\n  }\n\n  const apiClient = {\n    get: createMethod(\"get\"),\n    post: createMethod(\"post\"),\n    put: createMethod(\"put\"),\n    delete: createMethod(\"delete\")\n  }\n\n  return apiClient\n}\n\nexport default getServerApiClient\n"],"names":["app","converted","matchPath","requestUrl","query"],"mappings":"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"}
+{"version":3,"file":"getServerApiClient-BYu8h5Zd.js","sources":["../src/apiClient/getServerApiClient.ts"],"sourcesContent":["import { Application, IRouter, Request, Response } from \"express\"\nimport type { Ctx } from \"@rpcbase/api\"\n\n\ntype NextMiddleware = (err?: unknown) => void\ntype LayerHandler = (req: Request, res: Response, next: NextMiddleware) => void\n\ntype RouterLayer = {\n  name: string\n  match: (path: string) => boolean\n  handle: LayerHandler\n  route?: {\n    methods: Record<string, boolean | undefined>\n    path: string\n    stack: Array<{ handle: LayerHandler }>\n  }\n}\n\n\nexport const getServerApiClient = async(app: Application) => {\n  const callRoute = async <TResponse = Record<string, unknown>>(\n    app: Application,\n    method: string,\n    matchPath: string,\n    requestUrl: string,\n    req: Partial<Request>,\n    res: Partial<Response>\n  ): Promise<TResponse> => {\n    return new Promise((resolve, reject) => {\n      let isEnded = false\n      let timeoutId: ReturnType<typeof setTimeout> | null = null\n\n      const resolveRequest = (data: TResponse) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        resolve(data)\n      }\n\n      const rejectRequest = (error: unknown) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        reject(error)\n      }\n\n      const mockReq = {\n        ...req,\n        method: method.toUpperCase(),\n        url: requestUrl\n      } as Request\n\n      const mockRes = {\n        ...res,\n        json: (data: unknown) => {\n          resolveRequest(data as TResponse)\n        },\n        status: (statusCode: number) => {\n          console.log(\"Status:\", statusCode, mockReq.method, mockReq.url)\n          return mockRes\n        },\n      } as Response\n\n      const routerStack = (app.router as unknown as IRouter).stack as unknown as RouterLayer[]\n\n      const firstApiMiddlewareIndex = routerStack.findIndex((layer) => layer.name === \"__FIRST_API_MIDDLEWARE__\")\n      if (!(firstApiMiddlewareIndex > -1)) {\n        throw new Error(\"middleware: __FIRST_API_MIDDLEWARE__ was not found in stack\")\n      }\n\n      const apiStack = routerStack.slice(firstApiMiddlewareIndex + 1)\n\n      const processLayer = async (index: number) => {\n        if (index >= apiStack.length || isEnded) return\n\n        const layer = apiStack[index]\n\n        const isNonMatchingLayer = !layer.match(matchPath)\n        if (isNonMatchingLayer) {\n          // console.log(\"not machthing route:\", matchPath, \"to layer:\", index, layer.name, layer, \"reason: \", {isNonMatchingLayer})\n          await processLayer(index + 1)\n          return\n        }\n\n        const runHandler = async(handler: LayerHandler) => new Promise<void>((resolveMiddleware, rejectMiddleware) => {\n          handler(mockReq, mockRes, (err?: unknown) => {\n            if (err) {\n              console.error(\"Middleware error:\", err)\n              rejectMiddleware(err)\n              return\n            }\n            resolveMiddleware()\n          })\n        })\n\n        if (layer.route) {\n          if (!layer.route.methods[method.toLowerCase()]) {\n            // console.log(\"not machthing route:\", matchPath, \"to route layer:\", index, layer.name, layer, \"reason: method not matching\")\n            await processLayer(index + 1)\n            return\n          }\n\n          if (layer.route.stack.length !== 1) {\n            throw new Error(`expected only one handler per route for route: ${layer.route.path}`)\n          }\n\n          await runHandler(layer.route.stack[0].handle)\n\n        } else {\n          await runHandler(layer.handle)\n        }\n\n        if (!isEnded) {\n          await processLayer(index + 1)\n        }\n      }\n\n      void processLayer(0).catch((err) => {\n        rejectRequest(err)\n      })\n\n      // Set a timeout to prevent hanging\n      timeoutId = setTimeout(() => {\n        rejectRequest(new Error(\"Route handler timed out\"))\n      }, 30000)\n    })\n  }\n\n  const mergeQueryValues = (target: Record<string, string | string[]>, key: string, value: string) => {\n    const existing = target[key]\n    if (Array.isArray(existing)) {\n      existing.push(value)\n      return\n    }\n\n    if (typeof existing === \"string\") {\n      target[key] = [existing, value]\n      return\n    }\n\n    target[key] = value\n  }\n\n  const toQueryValue = (value: unknown): string | null => {\n    if (typeof value === \"string\") return value\n    if (typeof value === \"number\") return Number.isFinite(value) ? String(value) : null\n    if (typeof value === \"boolean\") return value ? \"true\" : \"false\"\n    if (typeof value === \"bigint\") return String(value)\n    if (value instanceof Date) return value.toISOString()\n    return null\n  }\n\n  const buildQuery = (path: string, payload: Record<string, unknown>) => {\n    const url = new URL(path, \"http://localhost\")\n\n    const query: Record<string, string | string[]> = {}\n    for (const [key, value] of url.searchParams) {\n      mergeQueryValues(query, key, value)\n    }\n\n    for (const [key, rawValue] of Object.entries(payload)) {\n      if (!key) continue\n\n      if (Array.isArray(rawValue)) {\n        for (const item of rawValue) {\n          const converted = toQueryValue(item)\n          if (converted !== null) mergeQueryValues(query, key, converted)\n        }\n        continue\n      }\n\n      const converted = toQueryValue(rawValue)\n      if (converted !== null) mergeQueryValues(query, key, converted)\n    }\n\n    const searchParams = new URLSearchParams()\n    for (const [key, rawValue] of Object.entries(query)) {\n      if (Array.isArray(rawValue)) {\n        for (const value of rawValue) {\n          searchParams.append(key, value)\n        }\n        continue\n      }\n\n      searchParams.append(key, rawValue)\n    }\n\n    const matchPath = url.pathname\n    const requestUrl = `${matchPath}${searchParams.toString() ? `?${searchParams.toString()}` : \"\"}`\n\n    return { matchPath, requestUrl, query }\n  }\n\n  const createMethod = (method: string) => {\n    return async <TResponse = Record<string, unknown>>(\n      path: string,\n      payload: Record<string, unknown>,\n      ctx?: Ctx,\n    ): Promise<TResponse> => {\n      if (!ctx) {\n        throw new Error(\"Context must be provided in SSR mode\")\n      }\n\n      const normalizedMethod = method.toLowerCase()\n\n      if (normalizedMethod === \"get\") {\n        const { matchPath, requestUrl, query } = buildQuery(path, payload)\n        return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: {}, query }, ctx.res)\n      }\n\n      const { matchPath, requestUrl, query } = buildQuery(path, {})\n      return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: payload, query }, ctx.res)\n    }\n  }\n\n  const apiClient = {\n    get: createMethod(\"get\"),\n    post: createMethod(\"post\"),\n    put: createMethod(\"put\"),\n    delete: createMethod(\"delete\")\n  }\n\n  return apiClient\n}\n\nexport default getServerApiClient\n"],"names":["app","converted","matchPath","requestUrl","query"],"mappings":"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"}

package/dist/index.js

@@ -5,8 +5,8 @@ import { getNavigationGuards, createRoutesFromElements, createBrowserRouter, Rou
 import { hydrateRoot } from "react-dom/client";
 import { r as reportClientException } from "./errorReporting-CVoUUKxW.js";
 import { s } from "./errorReporting-CVoUUKxW.js";
-import { m as hydrateRtsFromWindow, q as resolveRtsHydrationIdentityFromStaticRouterData, t as useQuery } from "./useQuery-Bz5cpWp4.js";
-import { R, S, n, p } from "./useQuery-Bz5cpWp4.js";
+import { m as hydrateRtsFromWindow, q as resolveRtsHydrationIdentityFromStaticRouterData, t as useQuery } from "./useQuery-n0OatV-X.js";
+import { R, S, n, p } from "./useQuery-n0OatV-X.js";
 const emptyUnsubscribe = () => {
 };
 const useMediaQuery = (query) => {
@@ -97,10 +97,11 @@ const startToaster = () => {
 const ensureReady = () => {
   if (typeof document === "undefined") startToaster();
 };
+const buildToastData = (data, id) => data ? { ...data, id } : { id };
 const toastFn = ((message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast(message, nextData);
   });
@@ -109,7 +110,7 @@ const toastFn = ((message, data) => {
 const toastSuccess = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.success(message, nextData);
   });
@@ -118,7 +119,7 @@ const toastSuccess = (message, data) => {
 const toastInfo = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.info(message, nextData);
   });
@@ -127,7 +128,7 @@ const toastInfo = (message, data) => {
 const toastWarning = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.warning(message, nextData);
   });
@@ -136,7 +137,7 @@ const toastWarning = (message, data) => {
 const toastError = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.error(message, nextData);
   });
@@ -145,7 +146,7 @@ const toastError = (message, data) => {
 const toastMessage = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.message(message, nextData);
   });
@@ -154,7 +155,7 @@ const toastMessage = (message, data) => {
 const toastLoading = (message, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.loading(message, nextData);
   });
@@ -163,7 +164,7 @@ const toastLoading = (message, data) => {
 const toastCustom = (jsx2, data) => {
   ensureReady();
   const id = resolveId(data?.id) ?? createToastId();
-  const nextData = data ? { ...data, id } : { id };
+  const nextData = buildToastData(data, id);
   enqueue((m) => {
     m.toast.custom(jsx2, nextData);
   });
@@ -180,7 +181,7 @@ const toastPromise = (promise, data) => {
     });
     return { unwrap };
   }
-  const id = resolveId(data?.id) ?? createToastId();
+  const id = resolveId(data.id) ?? createToastId();
   const nextData = { ...data, id };
   enqueue((m) => {
     m.toast.promise(startedPromise, nextData);
@@ -247,9 +248,9 @@ const ActiveToaster = () => {
       swipeDirections: isCoarsePointer ? void 0 : [],
       style: {
         pointerEvents: "auto",
-        ["--toast-close-button-start"]: "unset",
-        ["--toast-close-button-end"]: "0",
-        ["--toast-close-button-transform"]: "translate(35%, -35%)"
+        "--toast-close-button-start": "unset",
+        "--toast-close-button-end": "0",
+        "--toast-close-button-transform": "translate(35%, -35%)"
       },
       toastOptions: {
         style: {
@@ -387,12 +388,14 @@ const pickNavigationGuard = (args) => {
 };
 const getLocationDedupKey = (location) => location.key ?? `${location.pathname}${location.search}`;
 const hasUnloadBlockers = () => getNavigationGuards().some((guard) => guard.enabled && guard.shouldBlockUnload);
+const WINDOW_STATE_KEY = "__rpcbaseNavigationGuardWindowState";
+const INSTALLED_ROUTERS_KEY = "__rpcbaseNavigationGuardInstalledRouters";
+const BEFORE_UNLOAD_INSTALLED_KEY = "__rpcbaseBeforeUnloadNavigationGuardInstalled";
 const getWindowState = () => {
   if (typeof window === "undefined") return null;
-  const key = "__rpcbaseNavigationGuardWindowState";
-  const globalAny = window;
-  if (globalAny[key]) {
-    const existing = globalAny[key];
+  const globalWindow = window;
+  const existing = globalWindow[WINDOW_STATE_KEY];
+  if (existing) {
     if (typeof existing.suppressBeforeUnloadFromKey === "undefined") {
       existing.suppressBeforeUnloadFromKey = null;
     }
@@ -402,18 +405,17 @@ const getWindowState = () => {
     suppressBeforeUnloadFromKey: null,
     nativePromptActive: false
   };
-  globalAny[key] = created;
+  globalWindow[WINDOW_STATE_KEY] = created;
   return created;
 };
 const getGlobalGuardWeakSet = () => {
-  const key = "__rpcbaseNavigationGuardInstalledRouters";
-  const globalAny = globalThis;
-  const existing = globalAny[key];
+  const globalScope = globalThis;
+  const existing = globalScope[INSTALLED_ROUTERS_KEY];
   if (existing && existing instanceof WeakSet) {
     return existing;
   }
   const created = /* @__PURE__ */ new WeakSet();
-  globalAny[key] = created;
+  globalScope[INSTALLED_ROUTERS_KEY] = created;
   return created;
 };
 const installGlobalNavigationGuard = (router) => {
@@ -434,7 +436,7 @@ const installGlobalNavigationGuard = (router) => {
     return pickNavigationGuard(args) !== null;
   });
   router.subscribe((state) => {
-    if (windowState?.suppressBeforeUnloadFromKey && state?.location) {
+    if (windowState?.suppressBeforeUnloadFromKey) {
       const currentKey = getLocationDedupKey(state.location);
       if (currentKey !== windowState.suppressBeforeUnloadFromKey) {
         windowState.suppressBeforeUnloadFromKey = null;
@@ -477,10 +479,9 @@ const installGlobalNavigationGuard = (router) => {
     }
   });
   if (typeof window !== "undefined") {
-    const key = "__rpcbaseBeforeUnloadNavigationGuardInstalled";
-    const globalAny = window;
-    if (!globalAny[key]) {
-      globalAny[key] = true;
+    const globalWindow = window;
+    if (!globalWindow[BEFORE_UNLOAD_INSTALLED_KEY]) {
+      globalWindow[BEFORE_UNLOAD_INSTALLED_KEY] = true;
       window.addEventListener("beforeunload", (event) => {
         const state = getWindowState();
         if (state && state.suppressBeforeUnloadFromKey) {
@@ -558,8 +559,9 @@ const showErrorOverlay = (err) => {
   document.body.appendChild(overlay);
 };
 const handleServerErrors = () => {
-  if (window.__staticRouterHydrationData?.errors) {
-    const { errors } = window.__staticRouterHydrationData;
+  const hydrationData = window.__staticRouterHydrationData;
+  if (hydrationData?.errors) {
+    const { errors } = hydrationData;
     Object.values(errors).forEach((error) => {
       showErrorOverlay({
         plugin: "ssr-router",
@@ -583,14 +585,14 @@ const wrapLoaderWithTimeout = (loader, routeId) => async (...args) => new Promis
 });
 const applyLoaderTimeouts = (routes) => {
   routes.forEach((route) => {
-    if (route.loader) {
+    if (typeof route.loader === "function") {
       route.loader = wrapLoaderWithTimeout(route.loader, route.id);
     }
-    if (route.lazy) {
+    if (typeof route.lazy === "function") {
       const origLazy = route.lazy;
       route.lazy = async (...lazyArgs) => {
         const mod = await origLazy(...lazyArgs);
-        if (mod?.loader) {
+        if (typeof mod.loader === "function") {
           const origLoader = mod.loader;
           mod.loader = (...loaderArgs) => wrapLoaderWithTimeout(origLoader, route.id)(...loaderArgs);
         }