one 1.2.17 → 1.2.19

package/src/useLoader.ts

@@ -1,6 +1,5 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-import { useEffect, useRef } from 'react'
-import { useActiveParams, useParams, usePathname } from './hooks'
+import { useCallback, useSyncExternalStore } from 'react'
+import { useParams, usePathname } from './hooks'
 import { resolveHref } from './link/href'
 import { preloadingLoader } from './router/router'
 import { getLoaderPath } from './utils/cleanUrl'
@@ -8,130 +7,247 @@ import { dynamicImport } from './utils/dynamicImport'
 import { weakKey } from './utils/weakKey'
 import { useServerContext } from './vite/one-server-only'
 
-const promises: Record<string, undefined | Promise<void>> = {}
-const errors = {}
-const loadedData: Record<string, any> = {}
+type LoaderStateEntry = {
+  data: any
+  error: any
+  promise?: Promise<void>
+  state: 'idle' | 'loading'
+  timestamp?: number
+  hasLoadedOnce?: boolean
+}
 
-export function useLoader<
-  Loader extends Function,
+const loaderState: Record<string, LoaderStateEntry> = {}
+const subscribers = new Set<() => void>()
+
+function updateState(path: string, updates: Partial<LoaderStateEntry>) {
+  loaderState[path] = { ...loaderState[path], ...updates }
+  subscribers.forEach((callback) => {
+    callback()
+  })
+}
+
+function subscribe(callback: () => void) {
+  subscribers.add(callback)
+  return () => subscribers.delete(callback)
+}
+
+function getLoaderState(path: string, preloadedData?: any): LoaderStateEntry {
+  if (!loaderState[path]) {
+    loaderState[path] = {
+      data: preloadedData,
+      error: undefined,
+      promise: undefined,
+      state: 'idle',
+      hasLoadedOnce: !!preloadedData,
+    }
+  }
+  return loaderState[path]
+}
+
+export async function refetchLoader(pathname: string): Promise<void> {
+  updateState(pathname, {
+    state: 'loading',
+    error: null,
+  })
+
+  try {
+    const cacheBust = `${Date.now()}`
+    const loaderJSUrl = getLoaderPath(pathname, true, cacheBust)
+
+    const module = await dynamicImport(loaderJSUrl)
+    const result = await module.loader()
+
+    updateState(pathname, {
+      data: result,
+      state: 'idle',
+      timestamp: Date.now(),
+      hasLoadedOnce: true,
+    })
+  } catch (err) {
+    updateState(pathname, {
+      error: err,
+      state: 'idle',
+    })
+    throw err
+  }
+}
+
+export function useLoaderState<
+  Loader extends Function = any,
   Returned = Loader extends (p: any) => any ? ReturnType<Loader> : unknown,
->(loader: Loader): Returned extends Promise<any> ? Awaited<Returned> : Returned {
+>(
+  loader?: Loader
+): Loader extends undefined
+  ? { refetch: () => Promise<void>; state: 'idle' | 'loading' }
+  : {
+      data: Returned extends Promise<any> ? Awaited<Returned> : Returned
+      refetch: () => Promise<void>
+      state: 'idle' | 'loading'
+    } {
   const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } =
     useServerContext() || {}
 
-  // server side we just run the loader directly
-  if (typeof window === 'undefined') {
-    return useAsyncFn(
+  const params = useParams()
+  const pathname = usePathname()
+  const currentPath = resolveHref({ pathname, params }).replace(/index$/, '')
+
+  // server-side
+  if (typeof window === 'undefined' && loader) {
+    const serverData = useAsyncFn(
       loader,
       loaderPropsFromServerContext || {
-        path: usePathname(),
-        params: useActiveParams(),
+        path: pathname,
+        params,
       }
     )
+    return { data: serverData, refetch: async () => {}, state: 'idle' } as any
   }
 
-  const params = useParams()
-  const pathname = usePathname()
-
-  // Cannot use usePathname() here since it will change every time the route changes,
-  // but here here we want to get the current local pathname which renders this screen.
-  const currentPath = resolveHref({ pathname: pathname, params })
-    .replace(/index$/, '')
-    .replace(/\?.*/, '')
-
-  // only if it matches current route
+  // preloaded data from SSR
   const preloadedData =
     loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : undefined
 
-  const currentData = useRef(preloadedData)
+  const loaderStateEntry = useSyncExternalStore(
+    subscribe,
+    () => getLoaderState(currentPath, preloadedData),
+    () => getLoaderState(currentPath, preloadedData)
+  )
 
-  useEffect(() => {
-    if (preloadedData) {
-      loadedData[currentPath] = preloadedData
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [preloadedData])
+  const refetch = useCallback(() => refetchLoader(currentPath), [currentPath])
 
-  if (errors[currentPath]) {
-    throw errors[currentPath]
+  // no loader, just return state/refetch for the path
+  if (!loader) {
+    return {
+      refetch,
+      state: loaderStateEntry.state,
+    } as any
   }
 
-  const loaded = loadedData[currentPath]
-
-  if (typeof loaded !== 'undefined') {
-    return loaded
-  }
-
-  if (!preloadedData) {
+  // start initial load if needed
+  if (
+    !loaderStateEntry.data &&
+    !loaderStateEntry.promise &&
+    !loaderStateEntry.hasLoadedOnce &&
+    loader
+  ) {
+    // check for preloading loader first
     if (preloadingLoader[currentPath]) {
       if (typeof preloadingLoader[currentPath] === 'function') {
         preloadingLoader[currentPath] = preloadingLoader[currentPath]()
       }
-      promises[currentPath] = preloadingLoader[currentPath]
-        .then((val) => {
-          loadedData[currentPath] = val
+      const promise = preloadingLoader[currentPath]
+        .then((val: any) => {
+          delete preloadingLoader[currentPath]
+          updateState(currentPath, {
+            data: val,
+            hasLoadedOnce: true,
+            promise: undefined,
+          })
         })
-        .catch((err) => {
-          console.error(`Error loading loader`, err)
-          errors[currentPath] = err
-          delete promises[currentPath]
+        .catch((err: any) => {
+          console.error(`Error running loader()`, err)
           delete preloadingLoader[currentPath]
+          updateState(currentPath, {
+            error: err,
+            promise: undefined,
+          })
         })
-    }
-
-    if (!promises[currentPath]) {
-      const getData = async () => {
-        // for native add a prefix to route around vite dev server being in front of ours
-        const loaderJSUrl = getLoaderPath(currentPath, true)
 
+      loaderStateEntry.promise = promise
+    } else {
+      // initial load
+      const loadData = async () => {
         try {
-          const response = await (async () => {
-            if (process.env.TAMAGUI_TARGET === 'native') {
-              const nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios` /* TODO: platform */
-
-              try {
-                // On native, we need to fetch the loader code and eval it
-                const loaderJsCodeResp = await fetch(nativeLoaderJSUrl)
-                if (!loaderJsCodeResp.ok) {
-                  throw new Error(`Response not ok: ${loaderJsCodeResp.status}`)
-                }
-                const loaderJsCode = await loaderJsCodeResp.text()
-                // biome-ignore lint/security/noGlobalEval: we can't use dynamic `import` on native so we need to fetch and `eval` the code
-                const result = eval(
-                  `() => { var exports = {}; ${loaderJsCode}; return exports; }`
-                )()
-
-                if (typeof result.loader !== 'function') {
-                  throw new Error("Loader code isn't exporting a `loader` function")
-                }
-
-                return result
-              } catch (e) {
-                console.error(`Error fetching loader from URL: ${nativeLoaderJSUrl}, ${e}`)
-                return { loader: () => ({}) }
+          if (process.env.TAMAGUI_TARGET === 'native') {
+            const loaderJSUrl = getLoaderPath(currentPath, true)
+            const nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios`
+
+            try {
+              const loaderJsCodeResp = await fetch(nativeLoaderJSUrl)
+              if (!loaderJsCodeResp.ok) {
+                throw new Error(`Response not ok: ${loaderJsCodeResp.status}`)
               }
-            }
+              const loaderJsCode = await loaderJsCodeResp.text()
+              // biome-ignore lint/security/noGlobalEval: we need eval for native
+              const result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)()
 
-            // On web, we can use import to dynamically load the loader
-            return await dynamicImport(loaderJSUrl)
-          })()
+              if (typeof result.loader !== 'function') {
+                throw new Error("Loader code isn't exporting a `loader` function")
+              }
+
+              const data = await result.loader()
+              updateState(currentPath, {
+                data,
+                hasLoadedOnce: true,
+                promise: undefined,
+              })
+              return
+            } catch (e) {
+              updateState(currentPath, {
+                data: {},
+                promise: undefined,
+              })
+              return
+            }
+          }
 
-          loadedData[currentPath] = response.loader()
-          return loadedData[currentPath]
+          // web platform
+          const loaderJSUrl = getLoaderPath(currentPath, true)
+          const module = await dynamicImport(loaderJSUrl)
+          const result = await module.loader()
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: true,
+            promise: undefined,
+          })
         } catch (err) {
-          console.error(`Error calling loader: ${err}`)
-          errors[currentPath] = err
-          delete promises[currentPath]
-          return null
+          updateState(currentPath, {
+            error: err,
+            promise: undefined,
+          })
         }
       }
-      promises[currentPath] = getData()
+
+      const promise = loadData()
+      loaderStateEntry.promise = promise
     }
+  }
 
-    throw promises[currentPath]
+  // handle errors and suspension
+  if (loader) {
+    // only throw error on initial load
+    if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) {
+      throw loaderStateEntry.error
+    }
+
+    // only throw promise for suspension on initial load
+    if (
+      loaderStateEntry.data === undefined &&
+      loaderStateEntry.promise &&
+      !loaderStateEntry.hasLoadedOnce
+    ) {
+      throw loaderStateEntry.promise
+    }
+
+    return {
+      data: loaderStateEntry.data,
+      refetch,
+      state: loaderStateEntry.state,
+    } as any
+  } else {
+    return {
+      refetch,
+      state: loaderStateEntry.state,
+    } as any
   }
+}
 
-  return currentData.current
+export function useLoader<
+  Loader extends Function,
+  Returned = Loader extends (p: any) => any ? ReturnType<Loader> : unknown,
+>(loader: Loader): Returned extends Promise<any> ? Awaited<Returned> : Returned {
+  const { data } = useLoaderState(loader)
+  return data
 }
 
 const results = new Map()

package/src/utils/cleanUrl.ts

@@ -23,25 +23,22 @@ export function getPreloadPath(currentPath: string) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${PRELOAD_JS_POSTFIX}`
 }
 
-export function getLoaderPath(
-  currentPath: string,
-  // browser can be relative
-  includeUrl = isNative
-) {
+export function getLoaderPath(currentPath: string, includeUrl = isNative, cacheBust?: string) {
   const baseURL = includeUrl ? getURL() : ''
   const devPath = process.env.NODE_ENV === 'development' ? '/_one' : ''
 
-  const currentPathUrl = new URL(
-    currentPath,
-    'http://example.com' /* not important, just for `new URL()` to work */
-  )
+  const currentPathUrl = new URL(currentPath, 'http://example.com')
+
+  const cleanedUrl = cleanUrl(currentPathUrl.pathname.slice(1))
+  const cacheBustSegment = cacheBust ? `_refetch_${cacheBust}_` : ''
 
-  return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${LOADER_JS_POSTFIX}`
+  return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${LOADER_JS_POSTFIX}`
 }
 
 export function getPathFromLoaderPath(loaderPath: string) {
   return loaderPath
     .replace(LOADER_JS_POSTFIX_REGEX, '')
     .replace(/^(\/_one)?\/assets/, '')
+    .replace(/_refetch_\d+_/, '')
     .replaceAll(/_/g, '/')
 }

package/types/createHandleRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,CA8CnB;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAoBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AASD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE;;uBAUW,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAqE3F"}
+{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,CA8CnB;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAsCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAmCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AASD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE;;uBAUW,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAsE3F"}

package/types/experimental-useLoaderState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"experimental-useLoaderState.d.ts","sourceRoot":"","sources":["../src/experimental-useLoaderState.ts"],"names":[],"mappings":"AAOA,wBAAgB,0BAA0B,CAAC,MAAM,SAAS,QAAQ,EAAE,MAAM,EAAE,MAAM;;;;;EA6CjF"}

package/types/getDevServer.d.ts

@@ -0,0 +1,5 @@
+export declare const getDevServer: () => {
+    url: string;
+    bundleLoadedFromServer: boolean;
+};
+//# sourceMappingURL=getDevServer.d.ts.map

package/types/getDevServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDevServer.d.ts","sourceRoot":"","sources":["../src/getDevServer.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,YAAY;;;CAGvB,CAAA"}

package/types/getDevServer.native.d.ts

@@ -0,0 +1,2 @@
+export { default as getDevServer } from 'react-native/Libraries/Core/Devtools/getDevServer';
+//# sourceMappingURL=getDevServer.native.d.ts.map

package/types/getDevServer.native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDevServer.native.d.ts","sourceRoot":"","sources":["../src/getDevServer.native.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mDAAmD,CAAA"}

package/types/getURL.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getURL.native.d.ts","sourceRoot":"","sources":["../src/getURL.native.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,WAqBrB"}
+{"version":3,"file":"getURL.native.d.ts","sourceRoot":"","sources":["../src/getURL.native.ts"],"names":[],"mappings":"AAIA,wBAAgB,MAAM,WAwBrB"}

package/types/index.d.ts

@@ -38,7 +38,7 @@ export * as routerStore from './router/router';
 export { useNavigation } from './router/useNavigation';
 export type { Endpoint, LoaderProps } from './types';
 export { useFocusEffect } from './useFocusEffect';
-export { useLoader } from './useLoader';
+export { useLoader, useLoaderState } from './useLoader';
 export { type ServerHeadInsertionCallback, useServerHeadInsertion } from './useServerHeadInsertion';
 export { isResponse } from './utils/isResponse';
 export { redirect } from './utils/redirect';

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAGpD,MAAM,MAAM,IAAI,GAAG,aAAa,SAAS,MAAM,SAAS,CAAC,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC,IAAI,CAAA;AAEvF,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAG/E,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,cAAc,8BAA8B,CAAA;AAI5C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,SAAS,EACT,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,WAAW,EACX,qBAAqB,GACtB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,KAAK,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAGpD,MAAM,MAAM,IAAI,GAAG,aAAa,SAAS,MAAM,SAAS,CAAC,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC,IAAI,CAAA;AAEvF,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAG/E,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,cAAc,8BAA8B,CAAA;AAI5C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,SAAS,EACT,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,WAAW,EACX,qBAAqB,GACtB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,EAAE,KAAK,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA"}

package/types/server/oneServe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AAenD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAoShG"}
+{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AAgBnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAqShG"}

package/types/types.d.ts

@@ -6,6 +6,7 @@ export type Endpoint = (req: Request) => Response | string | Object | null;
 export type RenderApp = (props: RenderAppProps) => Promise<string>;
 export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
     path: string;
+    search?: string;
     params: Params;
     request?: Request;
 };

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI;IACnF,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,GAAG,CAAC,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI;IACnF,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,GAAG,CAAC,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}

package/types/useLoader.d.ts

@@ -1,2 +1,11 @@
+export declare function refetchLoader(pathname: string): Promise<void>;
+export declare function useLoaderState<Loader extends Function = any, Returned = Loader extends (p: any) => any ? ReturnType<Loader> : unknown>(loader?: Loader): Loader extends undefined ? {
+    refetch: () => Promise<void>;
+    state: 'idle' | 'loading';
+} : {
+    data: Returned extends Promise<any> ? Awaited<Returned> : Returned;
+    refetch: () => Promise<void>;
+    state: 'idle' | 'loading';
+};
 export declare function useLoader<Loader extends Function, Returned = Loader extends (p: any) => any ? ReturnType<Loader> : unknown>(loader: Loader): Returned extends Promise<any> ? Awaited<Returned> : Returned;
 //# sourceMappingURL=useLoader.d.ts.map

package/types/useLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLoader.d.ts","sourceRoot":"","sources":["../src/useLoader.ts"],"names":[],"mappings":"AAcA,wBAAgB,SAAS,CACvB,MAAM,SAAS,QAAQ,EACvB,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EACxE,MAAM,EAAE,MAAM,GAAG,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAqH9E"}
+{"version":3,"file":"useLoader.d.ts","sourceRoot":"","sources":["../src/useLoader.ts"],"names":[],"mappings":"AA8CA,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BnE;AAED,wBAAgB,cAAc,CAC5B,MAAM,SAAS,QAAQ,GAAG,GAAG,EAC7B,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EAExE,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,SAAS,SAAS,GACvB;IAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC3D;IACE,IAAI,EAAE,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;IAClE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CA6JJ;AAED,wBAAgB,SAAS,CACvB,MAAM,SAAS,QAAQ,EACvB,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EACxE,MAAM,EAAE,MAAM,GAAG,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAG9E"}

package/types/utils/cleanUrl.d.ts

@@ -1,4 +1,4 @@
 export declare function getPreloadPath(currentPath: string): string;
-export declare function getLoaderPath(currentPath: string, includeUrl?: boolean): string;
+export declare function getLoaderPath(currentPath: string, includeUrl?: boolean, cacheBust?: string): string;
 export declare function getPathFromLoaderPath(loaderPath: string): string;
 //# sourceMappingURL=cleanUrl.d.ts.map

package/types/utils/cleanUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanUrl.d.ts","sourceRoot":"","sources":["../../src/utils/cleanUrl.ts"],"names":[],"mappings":"AAqBA,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,UAEjD;AAED,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EAEnB,UAAU,UAAW,UAWtB;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,UAKvD"}
+{"version":3,"file":"cleanUrl.d.ts","sourceRoot":"","sources":["../../src/utils/cleanUrl.ts"],"names":[],"mappings":"AAqBA,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,UAEjD;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,UAAW,EAAE,SAAS,CAAC,EAAE,MAAM,UAU3F;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,UAMvD"}