one 1.1.388 → 1.1.390

package/src/utils/useConstant.ts

@@ -0,0 +1,18 @@
+import * as React from 'react'
+
+type ResultBox<T> = { v: T }
+
+export function useConstant<T>(fn: () => T): T {
+  // RSC compat
+  if (typeof document === 'undefined') {
+    return React.useMemo(() => fn(), [])
+  }
+
+  const ref = React.useRef<ResultBox<T>>()
+
+  if (!ref.current) {
+    ref.current = { v: fn() }
+  }
+
+  return ref.current.v
+}

package/src/utils/withStaticProperties.ts

@@ -0,0 +1,32 @@
+import React from 'react'
+
+const Decorated = Symbol()
+
+type Combined<A, B> = A & B
+
+export const withStaticProperties = <A extends Function, B>(
+  component: A,
+  staticProps: B
+): Combined<A, B> => {
+  // clone component if already wrapped once
+  const next = (() => {
+    if (component[Decorated]) {
+      const _ = React.forwardRef((props, ref) =>
+        React.createElement(component as any, { ...props, ref })
+      )
+      // attach existing things again
+      for (const key in component) {
+        const v = component[key]
+        // @ts-ignore
+        _[key] = v && typeof v === 'object' ? { ...v } : v
+      }
+    }
+    return component
+  })()
+
+  // add new things
+  Object.assign(next, staticProps)
+  next[Decorated] = true
+
+  return next as any as A & B
+}

package/src/views/EmptyRoute.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { useRouteNode } from '../Route'
+import { useRouteNode } from '../router/Route'
 
 // import { Toast, ToastWrapper } from './Toast'
 

package/src/views/LoadProgressBar.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
 import { View, type ViewProps } from 'react-native'
-import { router } from '../imperative-api'
+import { router } from '../router/imperative-api'
 
 export type LoadProgressBarProps = {
   /** How long after a navigation to wait before showing the progress bar (in ms) */

package/src/views/Navigator.tsx

@@ -2,9 +2,9 @@
 import { StackRouter, useNavigationBuilder, type RouterFactory } from '@react-navigation/native'
 import * as React from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { useContextKey } from '../Route'
+import { useContextKey } from '../router/Route'
 import { useFilterScreenChildren } from '../layouts/withLayoutContext'
-import { useSortedScreens } from '../useScreens'
+import { useSortedScreens } from '../router/useScreens'
 import { Screen } from './Screen'
 
 type NavigatorTypes = ReturnType<typeof useNavigationBuilder>

package/src/views/Screen.tsx

@@ -1,5 +1,5 @@
 import { useIsomorphicLayoutEffect } from '@vxrn/use-isomorphic-layout-effect'
-import { useNavigation } from '../useNavigation'
+import { useNavigation } from '../router/useNavigation'
 
 export type ScreenProps<TOptions extends Record<string, any> = Record<string, any>> = {
   /**

package/src/vite/DevHead.tsx

@@ -0,0 +1,39 @@
+import { VIRTUAL_SSR_CSS_HREF } from '../constants'
+
+// replacing Vites since we control the root
+export function DevHead() {
+  if (process.env.TAMAGUI_TARGET === 'native') {
+    return null
+  }
+  if (process.env.NODE_ENV === 'development') {
+    return (
+      <>
+        <link rel="preload" href={VIRTUAL_SSR_CSS_HREF} as="style" />
+        <link rel="stylesheet" href={VIRTUAL_SSR_CSS_HREF} data-ssr-css />
+        <script
+          type="module"
+          dangerouslySetInnerHTML={{
+            __html: `import { createHotContext } from "/@vite/client";
+  const hot = createHotContext("/__clear_ssr_css");
+  hot.on("vite:afterUpdate", () => {
+    document
+      .querySelectorAll("[data-ssr-css]")
+      .forEach(node => node.remove());
+  });`,
+          }}
+        />
+        <script
+          type="module"
+          dangerouslySetInnerHTML={{
+            __html: `import { injectIntoGlobalHook } from "/@react-refresh";
+  injectIntoGlobalHook(window);
+  window.$RefreshReg$ = () => {};
+  window.$RefreshSig$ = () => (type) => type;`,
+          }}
+        />
+      </>
+    )
+  }
+
+  return null
+}

package/src/vite/one.ts

@@ -410,34 +410,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       },
     } satisfies Plugin,
 
-    // {
-    //   name: 'one-use-react-18-for-native',
-    //   enforce: 'pre',
-
-    //   async config() {
-    //     const sharedNativeConfig = {
-    //       resolve: {
-    //         alias: {
-    //           react: resolvePath('one/react-18', process.cwd()),
-    //           'react-dom': resolvePath('one/react-dom-18', process.cwd()),
-    //         },
-    //       },
-    //     } satisfies UserConfig
-
-    //     return {
-    //       environments: {
-    //         ios: {
-    //           ...sharedNativeConfig,
-    //         },
-    //         android: {
-    //           ...sharedNativeConfig,
-    //         },
-    //         // this started erroring for no reason..
-    //       } as any,
-    //     }
-    //   },
-    // } satisfies Plugin,
-
     {
       name: 'one:optimize-deps-load-web-extensions-web-only',
       enforce: 'pre',

package/src/vite/plugins/SSRCSSPlugin.ts

@@ -1,15 +1,11 @@
 import type { Plugin, ViteDevServer } from 'vite'
+import { VIRTUAL_SSR_CSS_ENTRY, VIRTUAL_SSR_CSS_HREF } from '../../constants'
 
 // thanks to hi-ogawa https://github.com/hi-ogawa/vite-plugins/tree/main/packages/ssr-css
 
-// safari insanely aggressive caching
-export const VIRTUAL_ENTRY = `virtual:ssr-css.css`
-
 export function SSRCSSPlugin(pluginOpts: { entries: string[] }): Plugin {
   let server: ViteDevServer
 
-  const virtualHref = '/@id/__x00__' + VIRTUAL_ENTRY
-
   return {
     name: `one-plugin-ssr-css`,
     apply: 'serve',
@@ -18,8 +14,8 @@ export function SSRCSSPlugin(pluginOpts: { entries: string[] }): Plugin {
 
       // invalidate virtual modules for each direct request
       server.middlewares.use(async (req, res, next) => {
-        if (req.url?.includes(virtualHref)) {
-          invalidateModule(server, '\0' + VIRTUAL_ENTRY + '?direct')
+        if (req.url?.includes(VIRTUAL_SSR_CSS_HREF)) {
+          invalidateModule(server, '\0' + VIRTUAL_SSR_CSS_ENTRY + '?direct')
 
           let code = await collectStyle(server, pluginOpts.entries)
 
@@ -37,11 +33,11 @@ export function SSRCSSPlugin(pluginOpts: { entries: string[] }): Plugin {
     // virtual module
     // (use `startsWith` since Vite adds `?direct` for raw css request)
     resolveId(source, _importer, _options) {
-      return source.startsWith(VIRTUAL_ENTRY) ? '\0' + source : undefined
+      return source.startsWith(VIRTUAL_SSR_CSS_ENTRY) ? '\0' + source : undefined
     },
 
     async load(id, _options) {
-      if (id.startsWith('\0' + VIRTUAL_ENTRY)) {
+      if (id.startsWith('\0' + VIRTUAL_SSR_CSS_ENTRY)) {
         const url = new URL(id.slice(1), 'https://test.local')
         let code = await collectStyle(server, pluginOpts.entries)
         if (!url.searchParams.has('direct')) {
@@ -62,7 +58,7 @@ export function SSRCSSPlugin(pluginOpts: { entries: string[] }): Plugin {
             injectTo: 'head',
             attrs: {
               rel: 'stylesheet',
-              href: virtualHref,
+              href: VIRTUAL_SSR_CSS_HREF,
               'data-ssr-css': true,
             },
           },

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -12,6 +12,7 @@ import { LoaderDataCache } from '../../vite/constants'
 import { replaceLoader } from '../../vite/replaceLoader'
 import type { One } from '../../vite/types'
 import { virtalEntryIdClient, virtualEntryId } from './virtualEntryConstants'
+import { setServerContext } from '../../utils/serverContext'
 
 // server needs better dep optimization
 const USE_SERVER_ENV = false //!!process.env.USE_SERVER_ENV
@@ -29,7 +30,9 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
   function createRequestHandler() {
     return createHandleRequest({
       async handlePage({ route, url, loaderProps }) {
-        console.info(` ⓵  [${route.type}] ${url} resolved to ${route.file}`)
+        console.info(
+          ` ⓵  [${route.type}] ${url} resolved to ${route.isNotFound ? '‼️ 404 not found' : route.file}`
+        )
 
         if (route.type === 'spa') {
           // render just the layouts? route.layouts
@@ -70,8 +73,10 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
 
           const render = entry.default.render as (props: RenderAppProps) => any
 
-          globalThis['__vxrnLoaderData__'] = loaderData
-          globalThis['__vxrnLoaderProps__'] = loaderProps
+          setServerContext({
+            loaderData,
+            loaderProps,
+          })
 
           LoaderDataCache[route.file] = loaderData
 
@@ -193,9 +198,10 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
           ...new Set(
             handleRequest.manifest.pageRoutes.flatMap((route) => {
               return [
-                join('app', route.file),
-                ...(route.layouts?.map((layout) => {
-                  return join('app', layout.contextKey)
+                join('./app', route.file),
+                ...(route.layouts?.flatMap((layout) => {
+                  if (!layout.contextKey) return []
+                  return [join('./app', layout.contextKey)]
                 }) || []),
               ]
             })

package/src/vite/plugins/fixDependenciesPlugin.ts

@@ -31,7 +31,8 @@ export function fixDependenciesPlugin(options?: One.FixDependencies): Plugin {
     },
 
     async configResolved(config) {
-      if (patches.length) {
+      if (!hasApplied && patches.length) {
+        hasApplied = true
         await applyDependencyPatches(patches, config)
       }
     },

package/src/zero/useQuery.ts

@@ -2,8 +2,9 @@ import { useRef } from 'react'
 import { getQueryKey } from './getQueryKey'
 import { resolveZeroQuery } from './resolveQuery'
 import { useQuery as useQueryZero } from './useQueryZero'
+import { getServerContext } from '../utils/serverContext'
 
-let clientInitialData: Object | null = globalThis['__vxrnPostRenderData__']
+let clientInitialData: Object | null = getServerContext()?.postRenderData
 
 // AST_ID => data
 const serverQueryData = {}

package/types/Root.d.ts

@@ -1,8 +1,9 @@
 import { type NavigationContainerProps } from '@react-navigation/native';
 import { type FunctionComponent, type ReactNode } from 'react';
-import type { GlobbedRouteImports, RenderAppProps } from './types';
+import type { GlobbedRouteImports } from './types';
 import type { One } from './vite/types';
-type RootProps = RenderAppProps & Omit<InnerProps, 'context'> & {
+type RootProps = Omit<InnerProps, 'context'> & {
+    path: string;
     isClient?: boolean;
     routes: GlobbedRouteImports;
     routeOptions?: One.RouteOptions;

package/types/Root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAiC,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAK7F,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAKlE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAQvC,KAAK,SAAS,GAAG,cAAc,GAC7B,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAEH,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAED,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDA0FpC"}
+{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAuB,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAMnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAQvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAED,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDA2EpC"}

package/types/constants.d.ts

@@ -7,4 +7,6 @@ export declare const LOADER_JS_POSTFIX_REGEX_STRING = "_\\d+_vxrn_loader.js$";
 export declare const LOADER_JS_POSTFIX_REGEX: RegExp;
 export declare const LOADER_JS_POSTFIX: string;
 export declare const PRELOAD_JS_POSTFIX: string;
+export declare const VIRTUAL_SSR_CSS_ENTRY = "virtual:ssr-css.css";
+export declare const VIRTUAL_SSR_CSS_HREF = "/@id/__x00__virtual:ssr-css.css";
 //# sourceMappingURL=constants.d.ts.map

package/types/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,QAAQ,SAA0C,CAAA;AAE/D,eAAO,MAAM,SAAS,QAA4E,CAAA;AAElG,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAC3D,eAAO,MAAM,8BAA8B,0BAAwC,CAAA;AACnF,eAAO,MAAM,uBAAuB,QAA6C,CAAA;AACjF,eAAO,MAAM,iBAAiB,QAA+C,CAAA;AAE7E,eAAO,MAAM,kBAAkB,QAA6B,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,QAAQ,SAA0C,CAAA;AAE/D,eAAO,MAAM,SAAS,QAA4E,CAAA;AAElG,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAC3D,eAAO,MAAM,8BAA8B,0BAAwC,CAAA;AACnF,eAAO,MAAM,uBAAuB,QAA6C,CAAA;AACjF,eAAO,MAAM,iBAAiB,QAA+C,CAAA;AAE7E,eAAO,MAAM,kBAAkB,QAA6B,CAAA;AAG5D,eAAO,MAAM,qBAAqB,wBAAwB,CAAA;AAC1D,eAAO,MAAM,oBAAoB,oCAAyC,CAAA"}

package/types/createApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createApp.d.ts","sourceRoot":"","sources":["../src/createApp.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAK7C,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;CAAE,CAAA;AAqC/E,wBAAgB,SAAS,CAAC,OAAO,EAAE,cAAc;;oBAIrB,cAAc;EA2GzC"}
+{"version":3,"file":"createApp.d.ts","sourceRoot":"","sources":["../src/createApp.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAS7C,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;CAAE,CAAA;AAE/E,wBAAgB,SAAS,CAAC,OAAO,EAAE,cAAc;;oBAIrB,cAAc;EA+EzC"}

package/types/createHandleRequest.d.ts

@@ -1,4 +1,4 @@
-import type { RouteNode } from './Route';
+import type { RouteNode } from './router/Route';
 import type { RouteInfo, RouteInfoCompiled } from './server/createRoutesManifest';
 import type { LoaderProps } from './types';
 export type RequestHandlers = {

package/types/createHandleRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAM1C,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;AAoDtD,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,qBAkBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AAUD,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,CAAC,QAAQ,EAAE,eAAe;;uBASV,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAmE3F"}
+{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAM1C,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;AAoDtD,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,qBAkBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AAUD,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,CAAC,QAAQ,EAAE,eAAe;;uBASV,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAmE3F"}

package/types/fork/getStateFromPath.d.ts

@@ -1,5 +1,5 @@
 import type { PathConfigMap } from '@react-navigation/core';
-import type { RouteNode } from '../Route';
+import type { RouteNode } from '../router/Route';
 import type { OneRouter } from '../interfaces/router';
 type Options<ParamList extends object> = {
     initialRouteName?: string;

package/types/fork/getStateFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStateFromPath.d.ts","sourceRoot":"","sources":["../../src/fork/getStateFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAI3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,KAAK,OAAO,CAAC,SAAS,SAAS,MAAM,IAAI;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;CAClC,CAAA;AAED,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,CAAA;AAezD,KAAK,kBAAkB,GAAG;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,CAAA;AAQD,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,SAAqC;;;;;;;;EAwBxD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,SAAS,SAAS,MAAM,EAC/D,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC3B,SAAS,CAAC,WAAW,GAAG,SAAS,CAGnC;AAED,wBAAgB,wBAAwB,CAAC,SAAS,SAAS,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;;;gBA/ErF,MAAM;gBACN,MAAM;cACR,MAAM;iBACH,MAAM;oBACH,MAAM,EAAE;gBACZ,WAAW;qBACN,OAAO;0BACF,MAAM;iBACf,SAAS;;;EAmHnB;AA+qBD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,SAAqC,UASxD"}
+{"version":3,"file":"getStateFromPath.d.ts","sourceRoot":"","sources":["../../src/fork/getStateFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAI3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAIhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,KAAK,OAAO,CAAC,SAAS,SAAS,MAAM,IAAI;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;CAClC,CAAA;AAED,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,CAAA;AAezD,KAAK,kBAAkB,GAAG;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,CAAA;AAQD,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,SAAqC;;;;;;;;EAwBxD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,SAAS,SAAS,MAAM,EAC/D,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC3B,SAAS,CAAC,WAAW,GAAG,SAAS,CAGnC;AAED,wBAAgB,wBAAwB,CAAC,SAAS,SAAS,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;;;gBA/ErF,MAAM;gBACN,MAAM;cACR,MAAM;iBACH,MAAM;oBACH,MAAM,EAAE;gBACZ,WAAW;qBACN,OAAO;0BACF,MAAM;iBACf,SAAS;;;EAmHnB;AA+qBD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,SAAqC,UASxD"}

package/types/getReactNavigationConfig.d.ts

@@ -1,4 +1,4 @@
-import type { RouteNode } from './Route';
+import type { RouteNode } from './router/Route';
 export type Screen = string | {
     path: string;
     screens: Record<string, Screen>;

package/types/getReactNavigationConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getReactNavigationConfig.d.ts","sourceRoot":"","sources":["../src/getReactNavigationConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,MAAM,MAAM,GACd,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAqFL,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,OAAO,GAChB;IACD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC,CAKA"}
+{"version":3,"file":"getReactNavigationConfig.d.ts","sourceRoot":"","sources":["../src/getReactNavigationConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,MAAM,MAAM,GACd,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAqFL,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,OAAO,GAChB;IACD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC,CAKA"}

package/types/index.d.ts

@@ -4,8 +4,8 @@ import type { OneRouter } from './interfaces/router';
 export type Href = OneRouter.Href;
 export type LinkProps<T extends string | object = string> = OneRouter.LinkProps<T>;
 export type { Endpoint, LoaderProps } from './types';
-export { router } from './imperative-api';
-export { createRoute, route } from './createRoute';
+export { router } from './router/imperative-api';
+export { createRoute, route } from './router/createRoute';
 export { onClientLoaderResolve } from './clientLoaderResolver';
 export { createMiddleware, type Middleware } from './createMiddleware';
 export { render } from './render';
@@ -31,6 +31,6 @@ export { redirect } from './utils/redirect';
 export { href } from './href';
 export * from '@vxrn/universal-color-scheme';
 export { useFocusEffect } from './useFocusEffect';
-export { useNavigation } from './useNavigation';
+export { useNavigation } from './router/useNavigation';
 export { useLoader } from './useLoader';
 //# sourceMappingURL=index.d.ts.map

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,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;AACjC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElF,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAA;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EACL,SAAS,EACT,qBAAqB,EACrB,WAAW,EACX,yBAAyB,EACzB,SAAS,EACT,eAAe,EACf,WAAW,EACX,sBAAsB,GACvB,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG7B,cAAc,8BAA8B,CAAA;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,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,SAAS,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;AACjC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAElF,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGpD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAA;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EACL,SAAS,EACT,qBAAqB,EACrB,WAAW,EACX,yBAAyB,EACzB,SAAS,EACT,eAAe,EACf,WAAW,EACX,sBAAsB,GACvB,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,SAAS,CAAA;AAGhB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG7B,cAAc,8BAA8B,CAAA;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA"}

package/types/layouts/Drawer.d.ts

@@ -97,7 +97,7 @@ export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<DrawerNavigationOptions, DrawerNavigationState<ParamListBase>, DrawerNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Drawer;
 //# sourceMappingURL=Drawer.d.ts.map

package/types/layouts/Stack.d.ts

@@ -89,7 +89,7 @@ export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<NativeStackNavigationOptions, StackNavigationState<ParamListBase>, NativeStackNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Stack;
 //# sourceMappingURL=Stack.d.ts.map

package/types/layouts/Tabs.d.ts

@@ -1,9 +1,5 @@
 import { type BottomTabNavigationEventMap, type BottomTabNavigationOptions } from '@react-navigation/bottom-tabs';
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native';
-import type { OneRouter } from '../interfaces/router';
-type BottomTabNavigationOptionsWithHref = BottomTabNavigationOptions & {
-    href?: OneRouter.Href | null;
-};
 export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "initialRouteName" | "children" | "screenOptions" | "id" | "layout" | "screenListeners" | "screenLayout" | "UNSTABLE_getStateForRouteNamesChange"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
@@ -93,7 +89,7 @@ export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<i
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<BottomTabNavigationOptionsWithHref, TabNavigationState<ParamListBase>, BottomTabNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Tabs;
 //# sourceMappingURL=Tabs.d.ts.map

package/types/layouts/Tabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAGjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AA0BrD,KAAK,kCAAkC,GAAG,0BAA0B,GAAG;IACrE,IAAI,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,IAAI;cAJK,MAAO,SAAS;;;;;kBAY4C,MAC5E,SAAM;UAAW,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAe3B,gBACC,KAAC;;;;;eAKD,gBAAE,KAAK;kBACT,MAAA,YACN;UACE,MACF,YACR;;;;;cAvCsB,MAAO,SAAS;;;;;kBAY4C,MAC5E,SAAM;UAAW,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAe3B,gBACC,KAAC;;;;;eAKD,gBAAE,KAAK;kBACT,MAAA,YACN;UACE,MACF,YACR;;;;;;CAIiC,CAAA;AAEjC,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoCjF,eAAO,MAAM,IAAI;cAP4B,MAC1C,SAAS;;;;;kBAeO,MAAO,SAAS;UAC1B,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAcZ,gBAAI,KAAK;;;;;eAKP,gBACA,KAAR;kBAAmB,MAAO,YAAY;UAE9B,MAAA,YADU;;;;;cAtCiB,MAC1C,SAAS;;;;;kBAeO,MAAO,SAAS;UAC1B,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAcZ,gBAAI,KAAK;;;;;eAKP,gBACA,KAAR;kBAAmB,MAAO,YAAY;UAE9B,MAAA,YADU;;;;;;CAY3B,CAAA;AAED,eAAe,IAAI,CAAA"}

package/types/layouts/withLayoutContext.d.ts

@@ -1,19 +1,20 @@
 import type { EventMapBase, NavigationState } from '@react-navigation/native';
 import React from 'react';
 import type { PickPartial } from '../types';
-import { type ScreenProps } from '../useScreens';
+import { type ScreenProps } from '../router/useScreens';
+import { Screen } from '../views/Screen';
 export declare function useFilterScreenChildren(children: React.ReactNode, { isCustomNavigator, contextKey, }?: {
     isCustomNavigator?: boolean;
     /** Used for sending developer hints */
     contextKey?: string;
 }): {
-    screens: any[] | null | undefined;
+    screens: any[] | undefined;
     children: any[];
 };
 /** Return a navigator that automatically injects matched routes and renders nothing when there are no children. Return type with children prop optional */
 export declare function withLayoutContext<TOptions extends object, T extends React.ComponentType<any>, State extends NavigationState, EventMap extends EventMapBase>(Nav: T, processor?: (options: ScreenProps<TOptions, State, EventMap>[]) => ScreenProps<TOptions, State, EventMap>[], options?: {
     props: any;
-}): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, 'children'>> & React.RefAttributes<unknown>> & {
-    Screen: (props: ScreenProps<TOptions, State, EventMap>) => null;
+}): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, "children">> & React.RefAttributes<unknown>> & {
+    Screen: typeof Screen;
 };
 //# sourceMappingURL=withLayoutContext.d.ts.map

package/types/layouts/withLayoutContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAGlE,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;CACf;;;EA4CP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAClC,KAAK,SAAS,eAAe,EAC7B,QAAQ,SAAS,YAAY,EAE7B,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CACV,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAC9C,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GACvB,KAAK,CAAC,yBAAyB,CAChC,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GACrE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAC/B,GAAG;IACF,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,CAAA;CAChE,CA8BA"}
+{"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;CACf;;;EA6CP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAClC,KAAK,SAAS,eAAe,EAC7B,QAAQ,SAAS,YAAY,EAE7B,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CACV,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAC9C,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE;;EA8BzB"}

package/types/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AAKA,wBAAgB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,QAkC9C"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AAKA,wBAAgB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,QAgC9C"}

package/types/{Route.d.ts → router/Route.d.ts}

@@ -1,6 +1,6 @@
 import React, { type ReactNode } from 'react';
-import type { ErrorBoundaryProps } from './views/Try';
-import type { One } from './vite/types';
+import type { ErrorBoundaryProps } from '../views/Try';
+import type { One } from '../vite/types';
 export type DynamicConvention = {
     name: string;
     deep: boolean;

package/types/router/Route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../src/router/Route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAGxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAExC,MAAM,MAAM,iBAAiB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,WAAW,GAAG;IACxB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;IACvD,OAAO,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACvC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAA;IAClC,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAC3C,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAA;IACzC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAC3C,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,4BAA4B;IAC5B,IAAI,EAAE,GAAG,CAAC,SAAS,CAAA;IACnB,kEAAkE;IAClE,SAAS,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACrC,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,oBAAoB;IACpB,QAAQ,EAAE,SAAS,EAAE,CAAA;IACrB,kCAAkC;IAClC,OAAO,EAAE,IAAI,GAAG,iBAAiB,EAAE,CAAA;IACnC,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAA;IAClB,sBAAsB;IACtB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,oLAAoL;IACpL,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,qBAAqB;IACrB,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;IACrB,yBAAyB;IACzB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,kBAAkB,+DAAoE,CAAA;AAQnG,+DAA+D;AAC/D,wBAAgB,YAAY,IAAI,SAAS,GAAG,IAAI,CAE/C;AAED,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED,iEAAiE;AACjE,wBAAgB,KAAK,CAAC,EACpB,QAAQ,EACR,IAAI,EACJ,KAAK,GACN,EAAE;IACD,QAAQ,EAAE,SAAS,CAAA;IACnB,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;KAAE,CAAA;CACxD,2CAMA"}

package/types/{createRoute.d.ts → router/createRoute.d.ts}

@@ -1,4 +1,4 @@
-import type { OneRouter } from './interfaces/router';
+import type { OneRouter } from '../interfaces/router';
 export declare function createRoute<Path>(): {
     useParams: () => Partial<OneRouter.InputRouteParams<Path>>;
     useActiveParams: () => Partial<OneRouter.InputRouteParams<Path>>;

package/types/router/createRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createRoute.d.ts","sourceRoot":"","sources":["../../src/router/createRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,wBAAgB,WAAW,CAAC,IAAI;;;;;;;;EAS/B;AAkBD,QAAA,MAAM,WAAW;;;;;;;;CAA8B,CAAA;AAE/C,eAAO,MAAM,KAAK,EAAiB;IACjC,IAAI,EAAE;QACJ,GAAG,EAAE,OAAO,WAAW,CAAA;KACxB,CAAA;IACD,aAAa,EAAE,EAAE,CAAA;IACjB,OAAO,EAAE,EAAE,CAAA;CACZ,CAAA"}

package/types/router/filterRootHTML.d.ts

@@ -0,0 +1,19 @@
+type Props = Record<string, any>;
+export type FoundRootHTML = {
+    children: React.ReactElement;
+    htmlProps?: Props;
+    bodyProps?: Props;
+    head?: React.ReactElement;
+};
+/**
+ * To enable custom <html> and other html-like stuff in the root _layout
+ * we are doing some fancy stuff, namely, just capturing the root layout return
+ * value and deep-mapping over it.
+ *
+ * On server, we filter it out and hoist it to the parent root html in createApp
+ *
+ * On client, we just filter it out completely as in One we don't hydrate html
+ */
+export declare function filterRootHTML(el: React.ReactNode): FoundRootHTML;
+export {};
+//# sourceMappingURL=filterRootHTML.d.ts.map

package/types/router/filterRootHTML.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"filterRootHTML.d.ts","sourceRoot":"","sources":["../../src/router/filterRootHTML.ts"],"names":[],"mappings":"AAEA,KAAK,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAA;IAC5B,SAAS,CAAC,EAAE,KAAK,CAAA;IACjB,SAAS,CAAC,EAAE,KAAK,CAAA;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC,YAAY,CAAA;CAC1B,CAAA;AAED;;;;;;;;GAQG;AAEH,wBAAgB,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,GAAG,aAAa,CA2DjE"}

package/types/{getLinkingConfig.d.ts → router/getLinkingConfig.d.ts}

@@ -1,7 +1,7 @@
 import { type LinkingOptions } from '@react-navigation/native';
 import type { RouteNode } from './Route';
-import { type Screen } from './getReactNavigationConfig';
-import { getPathFromState } from './link/linking';
+import { type Screen } from '../getReactNavigationConfig';
+import { getPathFromState } from '../link/linking';
 export declare function getNavigationConfig(routes: RouteNode, metaOnly?: boolean): {
     initialRouteName?: string;
     screens: Record<string, Screen>;

package/types/router/getLinkingConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLinkingConfig.d.ts","sourceRoot":"","sources":["../../src/router/getLinkingConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,6BAA6B,CAAA;AACnF,OAAO,EAGL,gBAAgB,EAEjB,MAAM,iBAAiB,CAAA;AAExB,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,QAAQ,UAAO,GACd;IACD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC,CAEA;AAED,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG;IACvD,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAA;CAC3C,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,UAAO,GAAG,iBAAiB,CA0BtF;AAED,eAAO,MAAM,UAAU,kBAAyB,CAAA"}

package/types/{getRoutes.d.ts → router/getRoutes.d.ts}

@@ -1,5 +1,5 @@
 import type { DynamicConvention, RouteNode } from './Route';
-import type { One } from './vite/types';
+import type { One } from '../vite/types';
 export type Options = {
     ignore?: RegExp[];
     preserveApiRoutes?: boolean;

package/types/router/getRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../../src/router/getRoutes.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAE3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAWD;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CACvB,aAAa,EAAE,GAAG,CAAC,YAAY,EAC/B,OAAO,GAAE,OAAY,GACpB,SAAS,GAAG,IAAI,CAelB;AAiWD,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,YAM9C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAwBzF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAqBxE"}

package/types/router/imperative-api.d.ts

@@ -0,0 +1,3 @@
+import type { OneRouter } from '../interfaces/router';
+export declare const router: OneRouter.Router;
+//# sourceMappingURL=imperative-api.d.ts.map

package/types/router/imperative-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imperative-api.d.ts","sourceRoot":"","sources":["../../src/router/imperative-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,eAAO,MAAM,MAAM,EAAE,SAAS,CAAC,MAY9B,CAAA"}

package/types/router/matchers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../src/router/matchers.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIjE;AAED,kCAAkC;AAClC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,yBAAyB;AACzB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,sBAE/C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAGD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,WAExC"}

package/types/router/router.d.ts

@@ -1,7 +1,7 @@
 import { type NavigationContainerRefWithCurrent } from '@react-navigation/native';
 import { type ComponentType } from 'react';
-import type { RouteNode } from '../Route';
-import { type OneLinkingOptions } from '../getLinkingConfig';
+import type { RouteNode } from './Route';
+import { type OneLinkingOptions } from './getLinkingConfig';
 import type { OneRouter } from '../interfaces/router';
 import type { One } from '../vite/types';
 import { type UrlObject } from './getNormalizedStatePath';