one 1.2.46 → 1.2.48

package/src/typed-routes/injectRouteHelpers.ts

@@ -66,7 +66,10 @@ export async function injectRouteHelpers(
 /**
  * Adds createRoute to an existing import from 'one', or creates a new import
  */
-function addCreateRouteImport(content: string): { updatedContent: string; importAdded: boolean } {
+function addCreateRouteImport(content: string): {
+  updatedContent: string
+  importAdded: boolean
+} {
   // Check if already imports createRoute
   if (/import\s+[^'"]*createRoute[^'"]*from\s+['"]one['"]/m.test(content)) {
     return { updatedContent: content, importAdded: false }
@@ -80,7 +83,10 @@ function addCreateRouteImport(content: string): { updatedContent: string; import
     // Add createRoute to existing import
     const existingImports = match[1].trim()
     const newImports = existingImports ? `${existingImports}, createRoute` : 'createRoute'
-    const updatedContent = content.replace(oneImportRegex, `import { ${newImports} } from 'one'`)
+    const updatedContent = content.replace(
+      oneImportRegex,
+      `import { ${newImports} } from 'one'`
+    )
     return { updatedContent, importAdded: true }
   }
 
@@ -100,7 +106,10 @@ function addCreateRouteImport(content: string): { updatedContent: string; import
 /**
  * Adds RouteType to an existing type import from 'one', or creates a new import
  */
-function addRouteTypeImport(content: string): { updatedContent: string; importAdded: boolean } {
+function addRouteTypeImport(content: string): {
+  updatedContent: string
+  importAdded: boolean
+} {
   // Check if already imports RouteType
   if (/import\s+type\s+[^'"]*RouteType[^'"]*from\s+['"]one['"]/m.test(content)) {
     return { updatedContent: content, importAdded: false }

package/src/types.ts

@@ -5,11 +5,11 @@ export type PickPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 
 export type GlobbedRouteImports = Record<string, () => Promise<unknown>>
 
-export type Endpoint = (req: Request) => Response | string | Object | null
+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[]>> = {
+export type LoaderProps<Params extends object = Record<string, string | string[]>> = {
   path: string
   search?: string
   params: Params

package/src/ui/Slot.tsx

@@ -28,7 +28,9 @@ function ShimSlotForReactNative(Component: typeof RUISlot): typeof RUISlot {
   })
 }
 
-export interface Slot<Props = ViewProps, Ref = Component<ViewProps>>
-  extends ForwardRefExoticComponent<Props & RefAttributes<Ref>> {}
+export interface Slot<
+  Props = ViewProps,
+  Ref = Component<ViewProps>,
+> extends ForwardRefExoticComponent<Props & RefAttributes<Ref>> {}
 
 export const Slot: Slot = ShimSlotForReactNative(RUISlot) as Slot

package/src/ui/TabContext.tsx

@@ -96,7 +96,9 @@ export const TabsDescriptorsContext = createContext<TabsContextValue['descriptor
 /**
  * @hidden
  */
-export const TabsNavigatorContext = createContext<TabsContextValue['navigation'] | null>(null)
+export const TabsNavigatorContext = createContext<TabsContextValue['navigation'] | null>(
+  null
+)
 /**
  * @hidden
  */

package/src/ui/TabRouter.tsx

@@ -49,9 +49,14 @@ export function ExpoTabRouter(options: ExpoTabRouterOptions) {
       }
 
       // We should reset if this is the first time visiting the route
-      let shouldReset = !state.history.some((item) => item.key === route?.key) && !route.state
+      let shouldReset =
+        !state.history.some((item) => item.key === route?.key) && !route.state
 
-      if (!shouldReset && 'resetOnFocus' in action.payload && action.payload.resetOnFocus) {
+      if (
+        !shouldReset &&
+        'resetOnFocus' in action.payload &&
+        action.payload.resetOnFocus
+      ) {
         shouldReset = state.routes[state.index].key !== route.key
       }
 

package/src/ui/TabTrigger.tsx

@@ -1,6 +1,12 @@
 import { Slot } from '@radix-ui/react-slot'
 import type { TabNavigationState } from '@react-navigation/native'
-import { type ReactNode, use, type ReactElement, type ComponentProps, useCallback } from 'react'
+import {
+  type ReactNode,
+  use,
+  type ReactElement,
+  type ComponentProps,
+  useCallback,
+} from 'react'
 import {
   type View,
   StyleSheet,
@@ -95,7 +101,13 @@ function shouldHandleMouseEvent(
  * </Tabs>
  * ```
  */
-export function TabTrigger({ asChild, name, href, resetOnFocus, ...props }: TabTriggerProps) {
+export function TabTrigger({
+  asChild,
+  name,
+  href,
+  resetOnFocus,
+  ...props
+}: TabTriggerProps) {
   const { trigger, triggerProps } = useTabTrigger({
     name,
     resetOnFocus,
@@ -119,7 +131,12 @@ export function TabTrigger({ asChild, name, href, resetOnFocus, ...props }: TabT
     const reactNativeWebProps = { href: trigger?.resolvedHref }
 
     return (
-      <Pressable style={styles.tabTrigger} {...reactNativeWebProps} {...props} {...triggerProps}>
+      <Pressable
+        style={styles.tabTrigger}
+        {...reactNativeWebProps}
+        {...props}
+        {...triggerProps}
+      >
         {props.children}
       </Pressable>
     )

package/src/ui/Tabs.tsx

@@ -157,7 +157,9 @@ export function useTabsWithChildren(options: UseTabsWithChildrenOptions) {
  * }
  * ```
  */
-export function useTabsWithTriggers(options: UseTabsWithTriggersOptions): TabsContextValue {
+export function useTabsWithTriggers(
+  options: UseTabsWithTriggersOptions
+): TabsContextValue {
   const { triggers, ...rest } = options
   // Ensure we extend the parent triggers, so we can trigger them as well
   const parentTriggerMap = use(TabTriggerMapContext)
@@ -256,7 +258,11 @@ function parseTriggersFromChildren(
         children = children.props.children as ReactNode
       }
 
-      return parseTriggersFromChildren(children, screenTriggers, isInTabList || isTabList(child))
+      return parseTriggersFromChildren(
+        children,
+        screenTriggers,
+        isInTabList || isTabList(child)
+      )
     }
 
     // We should only process TabTriggers within the TabList. All other components will be ignored

package/src/ui/common.tsx

@@ -1,4 +1,9 @@
-import type { LinkingOptions, ParamListBase, PartialRoute, Route } from '@react-navigation/native'
+import type {
+  LinkingOptions,
+  ParamListBase,
+  PartialRoute,
+  Route,
+} from '@react-navigation/native'
 
 import type { ExpoTabActionType } from './TabRouter'
 import type { UrlObject } from '../router/getNormalizedStatePath'
@@ -7,7 +12,11 @@ import { resolveHref } from '../link/href'
 import { sortRoutesWithInitial } from '../router/sortRoutes'
 import type { OneRouter } from '../interfaces/router'
 import { Slot } from './Slot'
-import { Screen, createGetIdForRoute, getQualifiedRouteComponent } from '../router/useScreens'
+import {
+  Screen,
+  createGetIdForRoute,
+  getQualifiedRouteComponent,
+} from '../router/useScreens'
 
 export const ViewSlot = Slot
 
@@ -136,9 +145,12 @@ export function triggersToScreens(
       if (state.name === targetStateName) break
       state = state.state.routes[state.state.index ?? state.state.routes.length - 1]
     }
-    routeState = state.state?.routes[state.state.index ?? state.state.routes.length - 1] || state
+    routeState =
+      state.state?.routes[state.state.index ?? state.state.routes.length - 1] || state
 
-    const routeNode = layoutRouteNode.children.find((child) => child.route === routeState?.name)
+    const routeNode = layoutRouteNode.children.find(
+      (child) => child.route === routeState?.name
+    )
 
     if (!routeNode) {
       console.warn(
@@ -202,7 +214,9 @@ export function triggersToScreens(
           name={route.route}
           key={route.route}
           options={(args) => {
-            const staticOptions = route.generated ? route.loadRoute()?.getNavOptions : null
+            const staticOptions = route.generated
+              ? route.loadRoute()?.getNavOptions
+              : null
             const staticResult =
               typeof staticOptions === 'function' ? staticOptions(args) : staticOptions
             const output = {

package/src/useLoader.ts

@@ -83,8 +83,10 @@ export function useLoaderState<
       refetch: () => Promise<void>
       state: 'idle' | 'loading'
     } {
-  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } =
-    useServerContext() || {}
+  const {
+    loaderProps: loaderPropsFromServerContext,
+    loaderData: loaderDataFromServerContext,
+  } = useServerContext() || {}
 
   const params = useParams()
   const pathname = usePathname()
@@ -106,7 +108,8 @@ export function useLoaderState<
 
   // preloaded data from SSR/SSG - only use if server context path matches current path
   const serverContextPath = loaderPropsFromServerContext?.path
-  const preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : undefined
+  const preloadedData =
+    serverContextPath === currentPath ? loaderDataFromServerContext : undefined
 
   const loaderStateEntry = useSyncExternalStore(
     subscribe,
@@ -177,7 +180,9 @@ export function useLoaderState<
               }
               const loaderJsCode = await loaderJsCodeResp.text()
               // biome-ignore lint/security/noGlobalEval: we need eval for native
-              const result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)()
+              const result = eval(
+                `() => { var exports = {}; ${loaderJsCode}; return exports; }`
+              )()
 
               if (typeof result.loader !== 'function') {
                 throw new Error("Loader code isn't exporting a `loader` function")

package/src/utils/cleanUrl.ts

@@ -28,7 +28,11 @@ export function getPreloadCSSPath(currentPath: string) {
   return `${clientSideURL}/assets/${cleanUrl(currentPath.slice(1))}${CSS_PRELOAD_JS_POSTFIX}`
 }
 
-export function getLoaderPath(currentPath: string, includeUrl = isNative, cacheBust?: string) {
+export function getLoaderPath(
+  currentPath: string,
+  includeUrl = isNative,
+  cacheBust?: string
+) {
   const baseURL = includeUrl ? getURL() : ''
   const devPath = process.env.NODE_ENV === 'development' ? '/_one' : ''
 

package/src/utils/url.ts

@@ -10,7 +10,9 @@ export function isWellKnownUri(href: string): boolean {
   // This is a hack and we should change this to work like the web in the future where we have full confidence in the
   // ability to match URLs and send anything unmatched to the OS. The main difference between this and `hasUrlProtocolPrefix` is
   // that we don't require `//`, e.g. `mailto:` is valid and common, and `mailto://bacon` is invalid.
-  return /^(https?|mailto|tel|sms|geo|maps|market|itmss?|itms-apps|content|file):/.test(href)
+  return /^(https?|mailto|tel|sms|geo|maps|market|itmss?|itms-apps|content|file):/.test(
+    href
+  )
 }
 
 export function shouldLinkExternally(href: string): boolean {

package/src/vercel/build/buildVercelOutputDirectory.ts

@@ -63,9 +63,17 @@ export const buildVercelOutputDirectory = async ({
           `[one.build][vercel] generating serverless function for apiRoute ${route.page}`
         )
 
-        await createApiServerlessFunction(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)
+        await createApiServerlessFunction(
+          route,
+          compiledRoute.code,
+          oneOptionsRoot,
+          postBuildLogs
+        )
       } else {
-        console.warn('\n 🔨[one.build][vercel] apiRoute missing code compilation for', route.file)
+        console.warn(
+          '\n 🔨[one.build][vercel] apiRoute missing code compilation for',
+          route.file
+        )
       }
     }
   }
@@ -107,8 +115,13 @@ export const buildVercelOutputDirectory = async ({
     postBuildLogs.push(
       `[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
     )
-    await moveAllFiles(resolve(join(oneOptionsRoot, 'dist', 'middlewares')), vercelMiddlewareDir)
-    const vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, 'package.json'))
+    await moveAllFiles(
+      resolve(join(oneOptionsRoot, 'dist', 'middlewares')),
+      vercelMiddlewareDir
+    )
+    const vercelMiddlewarePackageJsonFilePath = resolve(
+      join(vercelMiddlewareDir, 'package.json')
+    )
     postBuildLogs.push(
       `[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
     )
@@ -120,10 +133,14 @@ export const buildVercelOutputDirectory = async ({
     const middlewaresByNamedRegex = getMiddlewaresByNamedRegex(buildInfoForWriting)
     const middlewaresToVariableNameMap = middlewaresByNamedRegex.reduce(
       (acc, [namedRegex, middlewares]) => {
-        ;(Array.isArray(middlewares) ? middlewares : [middlewares]).forEach((middleware) => {
-          const middlewareVariableName = middleware.replace(/\.[a-z]+$/, '').replaceAll('/', '_')
-          acc[middleware] = middlewareVariableName
-        })
+        ;(Array.isArray(middlewares) ? middlewares : [middlewares]).forEach(
+          (middleware) => {
+            const middlewareVariableName = middleware
+              .replace(/\.[a-z]+$/, '')
+              .replaceAll('/', '_')
+            acc[middleware] = middlewareVariableName
+          }
+        )
         return acc
       },
       {}
@@ -175,7 +192,9 @@ const wrappedMiddlewareFunction = (request, event) => {
 export { wrappedMiddlewareFunction as default }
   `
     )
-    const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, '.vc-config.json'))
+    const middlewareVercelConfigFilePath = resolve(
+      join(vercelMiddlewareDir, '.vc-config.json')
+    )
     postBuildLogs.push(
       `[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
     )
@@ -229,7 +248,9 @@ export { wrappedMiddlewareFunction as default }
       return { src, dest }
     })
 
-  const vercelConfigFilePath = resolve(join(oneOptionsRoot, '.vercel/output', 'config.json'))
+  const vercelConfigFilePath = resolve(
+    join(oneOptionsRoot, '.vercel/output', 'config.json')
+  )
   await writeJSON(vercelConfigFilePath, {
     ...vercelBuildOutputConfigBase,
     routes: [

package/src/vercel/build/generate/createApiServerlessFunction.ts

@@ -23,7 +23,9 @@ export async function createApiServerlessFunction(
   try {
     const path = getPathFromRoute(route, { includeIndex: true })
 
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`)
+    postBuildLogs.push(
+      `[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`
+    )
 
     const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${path}.func`)
     await fs.ensureDir(funcFolder)
@@ -33,7 +35,10 @@ export async function createApiServerlessFunction(
         `[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`
       )
       const reactPath = dirname(resolvePath('react/package.json', oneOptionsRoot))
-      await fs.copy(resolve(reactPath), resolve(join(funcFolder, 'node_modules', 'react')))
+      await fs.copy(
+        resolve(reactPath),
+        resolve(join(funcFolder, 'node_modules', 'react'))
+      )
     }
 
     const distAssetsFolder = resolve(join(funcFolder, 'assets'))
@@ -177,7 +182,10 @@ function wrapHandlerFunctions(code) {
       wrapperFunction.extra.isWrapper = true
 
       if (path.parentPath.isExportNamedDeclaration()) {
-        path.replaceWithMultiple([originalFunction, t.exportNamedDeclaration(wrapperFunction, [])])
+        path.replaceWithMultiple([
+          originalFunction,
+          t.exportNamedDeclaration(wrapperFunction, []),
+        ])
       } else {
         path.replaceWithMultiple([originalFunction, wrapperFunction])
       }

package/src/vercel/build/generate/createSsrServerlessFunction.ts

@@ -18,7 +18,9 @@ export async function createSsrServerlessFunction(
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`)
 
     const buildInfoAsString = JSON.stringify(buildInfo)
-    const funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`))
+    const funcFolder = resolve(
+      join(oneOptionsRoot, `.vercel/output/functions/${path}.func`)
+    )
     await fs.ensureDir(funcFolder)
 
     const distServerFrom = resolve(join(oneOptionsRoot, 'dist', 'server'))
@@ -29,8 +31,13 @@ export async function createSsrServerlessFunction(
     )
     await fs.copy(distServerFrom, distServerTo)
 
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing buildInfo.json`)
-    await fs.writeFile(join(funcFolder, 'buildInfo.js'), `export default ${buildInfoAsString}`)
+    postBuildLogs.push(
+      `[one.build][vercel.createSsrServerlessFunction] writing buildInfo.json`
+    )
+    await fs.writeFile(
+      join(funcFolder, 'buildInfo.js'),
+      `export default ${buildInfoAsString}`
+    )
 
     await fs.ensureDir(join(funcFolder, 'entrypoint'))
     const entrypointFilePath = resolve(join(funcFolder, 'entrypoint', 'index.js'))

package/src/vercel/build/getPathFromRoute.ts

@@ -5,7 +5,10 @@ export function getPathFromRoute(
   route: RouteInfo<string>,
   options: { includeIndex?: boolean } = {}
 ) {
-  return getPathnameFromFilePath(route.file, {}, false, { ...options, preserveExtensions: true })
+  return getPathnameFromFilePath(route.file, {}, false, {
+    ...options,
+    preserveExtensions: true,
+  })
     .replace(/^\.\//, '/')
     .replace(/\/+$/, '')
 }

package/src/views/Navigator.tsx

@@ -1,5 +1,9 @@
 // Copyright © 2024 650 Industries.
-import { type RouterFactory, StackRouter, useNavigationBuilder } from '@react-navigation/native'
+import {
+  type RouterFactory,
+  StackRouter,
+  useNavigationBuilder,
+} from '@react-navigation/native'
 import * as React from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useFilterScreenChildren } from '../layouts/withLayoutContext'
@@ -31,7 +35,12 @@ export type NavigatorProps = {
 }
 
 /** An unstyled custom navigator. Good for basic web layouts */
-export function Navigator({ initialRouteName, screenOptions, children, router }: NavigatorProps) {
+export function Navigator({
+  initialRouteName,
+  screenOptions,
+  children,
+  router,
+}: NavigatorProps) {
   const contextKey = useContextKey()
 
   // Allows adding Screen components as children to configure routes.
@@ -68,13 +77,16 @@ function QualifiedNavigator({
   contextKey,
   router = StackRouter,
 }: NavigatorProps & { contextKey: string; screens: React.ReactNode[] }) {
-  const { state, navigation, descriptors, NavigationContent } = useNavigationBuilder(router, {
-    // Used for getting the parent with navigation.getParent('/normalized/path')
-    id: contextKey,
-    children: screens,
-    screenOptions,
-    initialRouteName,
-  })
+  const { state, navigation, descriptors, NavigationContent } = useNavigationBuilder(
+    router,
+    {
+      // Used for getting the parent with navigation.getParent('/normalized/path')
+      id: contextKey,
+      children: screens,
+      screenOptions,
+      initialRouteName,
+    }
+  )
 
   const value = React.useMemo(() => {
     return {

package/src/views/RootErrorBoundary.tsx

@@ -15,7 +15,9 @@ export class RootErrorBoundary extends React.Component<{ children: any }> {
     //   in ErrorBoundary (created by App)
     //   in div (created by App)
     //   in App
-    console.error(`RootErrorBoundary.error:\n${printError(error)}\n${info.componentStack}`)
+    console.error(
+      `RootErrorBoundary.error:\n${printError(error)}\n${info.componentStack}`
+    )
   }
 
   render() {

package/src/views/Screen.tsx

@@ -15,7 +15,10 @@ export type ScreenProps<TOptions extends Record<string, any> = Record<string, an
 }
 
 /** Component for setting the current screen's options dynamically. */
-export function Screen<TOptions extends object = object>({ name, options }: ScreenProps<TOptions>) {
+export function Screen<TOptions extends object = object>({
+  name,
+  options,
+}: ScreenProps<TOptions>) {
   const navigation = useNavigation(name)
 
   useIsomorphicLayoutEffect(() => {

package/src/vite/loadConfig.ts

@@ -10,7 +10,9 @@ export function setOneOptions(next: One.PluginOptions) {
 
 function getUserOneOptions() {
   if (!globalThis.__oneOptions) {
-    throw new Error(`One not loaded properly, is the one() plugin in your vite.config.ts?`)
+    throw new Error(
+      `One not loaded properly, is the one() plugin in your vite.config.ts?`
+    )
   }
   return globalThis.__oneOptions as One.PluginOptions
 }
@@ -29,7 +31,9 @@ export async function loadUserOneOptions(command: 'serve' | 'build', silent = fa
     })
 
     if (!config) {
-      throw new Error(`No config config in ${process.cwd()}. Is this the correct directory?`)
+      throw new Error(
+        `No config config in ${process.cwd()}. Is this the correct directory?`
+      )
     }
 
     const oneOptions = getUserOneOptions()

package/src/vite/one-server-only.tsx

@@ -34,7 +34,9 @@ export const asyncHeadersCache =
 
 globalThis['__vxrnasyncHeadersCache'] ||= asyncHeadersCache
 
-export async function runWithAsyncLocalContext<A>(cb: (id: Object) => Promise<A>): Promise<A> {
+export async function runWithAsyncLocalContext<A>(
+  cb: (id: object) => Promise<A>
+): Promise<A> {
   const id = { _id: Math.random() }
   let out: A = null as any
   await ASYNC_LOCAL_STORE.current!.run(id, async () => {
@@ -74,13 +76,15 @@ export function ensureAsyncLocalID() {
   // since Vercel ultimately deploys to AWS Lambda, which does not have this issue
   // The Error you willl see is something like this:
   //    Error: Internal One error, no AsyncLocalStorage id! at ensureAsyncLocalID (file:///var/task/server/_virtual_one-entry.js:37411:64)
-  const id = process.env.VERCEL ? globalThis[GLOBAL_ID_KEY] : requestAsyncLocalStore?.getStore()
+  const id = process.env.VERCEL
+    ? globalThis[GLOBAL_ID_KEY]
+    : requestAsyncLocalStore?.getStore()
 
   if (!id) {
     throw new Error(`Internal One error, no AsyncLocalStorage id!`)
   }
 
-  return id as Object
+  return id as object
 }
 
 export type MaybeServerContext = null | One.ServerContext
@@ -152,7 +156,9 @@ export function setServerData<Key extends keyof One.ClientData>(
       },
     })
   } else {
-    throw new Error(`Cannot setServerData in ${process.env.VITE_ENVIRONMENT} environment!`)
+    throw new Error(
+      `Cannot setServerData in ${process.env.VITE_ENVIRONMENT} environment!`
+    )
   }
 }