WIP

Author: chrisnojima

shared/chat/routes.tsx

@@ -15,10 +15,6 @@ import {defineRouteMap} from '@/constants/types/router'
 import type {BlockModalContext} from './blocking/block-modal'
 const Convo = React.lazy(async () => import('./conversation/container'))
 
-type ChatAddToChannelRouteParams = {
-  conversationIDKey?: T.Chat.ConversationIDKey
-  teamID: T.Teams.TeamID
-}
 type ChatBlockingRouteParams = {
   blockUserByDefault?: boolean
   filterUserByDefault?: boolean
@@ -30,16 +26,6 @@ type ChatBlockingRouteParams = {
   team?: string
   username?: string
 }
-type ChatConfirmRemoveBotRouteParams = {
-  botUsername: string
-  teamID?: T.Teams.TeamID
-  conversationIDKey?: T.Chat.ConversationIDKey
-}
-type ChatInstallBotRouteParams = {
-  botUsername: string
-  conversationIDKey?: T.Chat.ConversationIDKey
-  teamID?: T.Teams.TeamID
-}
 type ChatSearchBotsRouteParams = {
   teamID?: T.Teams.TeamID
   conversationIDKey?: T.Chat.ConversationIDKey

shared/constants/router.tsx

@@ -12,6 +12,7 @@ import {
 } from '@react-navigation/core'
 import type {StaticScreenProps} from '@react-navigation/core'
 import type {
+  AllOptionalParamRouteKeys,
   NoParamRouteKeys,
   ParamRouteKeys,
   RouteKeys,
@@ -24,11 +25,13 @@ import {shallowEqual} from './utils'
 import {registerDebugClear} from '@/util/debug'
 import {makeUUID} from '@/util/uuid'
 
-type IsExactlyRecord<T> = [T] extends [Record<string, unknown>]
-  ? [Record<string, unknown>] extends [T]
-    ? true
-    : false
-  : false
+// Detects the unconstrained Record<string,unknown> index-signature type.
+// We can't use bidirectional assignability ([Record] extends [T] && [T] extends [Record])
+// because TypeScript allows Record<string,unknown> to be assigned to any all-optional-property
+// type, making the check incorrectly return true for {x?: string} etc.
+// Instead, check for an index signature: string extends keyof T is true only for
+// Record<string,unknown>-like types (index signatures), not for specific property types.
+type IsExactlyRecord<T> = string extends keyof T ? true : false
 
 type NavigatorParamsFromProps<P> = P extends Record<string, unknown>
   ? IsExactlyRecord<P> extends true
@@ -248,7 +251,7 @@ export const navUpToScreen = (name: RouteKeys) => {
   n.dispatch(StackActions.popTo(typeof name === 'string' ? name : String(name)))
 }
 
-export function navigateAppend<RouteName extends NoParamRouteKeys>(path: RouteName, replace?: boolean): void
+export function navigateAppend<RouteName extends NoParamRouteKeys | AllOptionalParamRouteKeys>(path: RouteName, replace?: boolean): void
 export function navigateAppend<RouteName extends ParamRouteKeys>(
   path: {name: RouteName; params: KBRootParamList[RouteName]},
   replace?: boolean

shared/constants/types/router.tsx

@@ -72,7 +72,7 @@ export type GetOptionsRet =
       })
   | undefined
 
-type AnyScreen = React.ComponentType<any>
+type AnyScreen = React.ComponentType<any> | React.LazyExoticComponent<any>
 type ScreenRouteParams<Screen extends AnyScreen> =
   React.ComponentProps<Screen> extends {route: {params: infer Params}}
     ? Params
@@ -86,7 +86,10 @@ export type GetOptions<Screen extends AnyScreen = AnyScreen> =
 
 export type RouteDef<Screen extends AnyScreen = AnyScreen, Params = ScreenRouteParams<Screen>> = {
   __routeParams?: Params
-  getOptions?: GetOptions<Screen>
+  // Use `any` for the function param to avoid RouteDef being contravariant in Screen.
+  // GetOptions<Screen> would cause RouteDef<SpecificScreen> to not be assignable to RouteDef<AnyScreen>
+  // because of function parameter contravariance. Typed getOptions are used in makeScreen / makeChatScreen.
+  getOptions?: GetOptionsRet | ((p: any) => GetOptionsRet)
   initialParams?: Params
   screen: Screen
 }

shared/router-v2/route-params.tsx

@@ -46,6 +46,11 @@ export type NoParamRouteKeys = {
   [K in RouteKeys]: RootParamList[K] extends undefined ? K : never
 }[RouteKeys]
 export type ParamRouteKeys = Exclude<RouteKeys, NoParamRouteKeys>
+// Routes with required params would break if navigated to without params.
+// Routes where all params are optional can be safely navigated to with just a name string.
+export type AllOptionalParamRouteKeys = {
+  [K in ParamRouteKeys]: {} extends NonNullable<RootParamList[K]> ? K : never
+}[ParamRouteKeys]
 export type NavigateAppendArg<RouteName extends RouteKeys> = RootParamList[RouteName] extends undefined
   ? RouteName
   : {name: RouteName; params: RootParamList[RouteName]}

shared/stores/chat.tsx

@@ -2014,11 +2014,8 @@ export const useChatState = Z.createZustand<State>('chat', (set, get) => {
   }
 })
 
-type IsExactlyRecord<T> = [T] extends [Record<string, unknown>]
-  ? [Record<string, unknown>] extends [T]
-    ? true
-    : false
-  : false
+// See constants/router.tsx IsExactlyRecord for explanation
+type IsExactlyRecord<T> = string extends keyof T ? true : false
 
 type NavigatorParamsFromProps<P> = P extends Record<string, unknown>
   ? IsExactlyRecord<P> extends true

shared/stores/convostate.tsx

@@ -3632,23 +3632,13 @@ export function ProviderScreen(p: {children: React.ReactNode; rp: RouteParams; c
   )
 }
 
-import type {NoParamRouteKeys, ParamRouteKeys, RootParamList} from '@/router-v2/route-params'
+import type {NavigateAppendType} from '@/router-v2/route-params'
 export const useChatNavigateAppend = () => {
   const cid = useChatContext(s => s.id)
-  function chatNavigateAppend<RouteName extends NoParamRouteKeys>(
-    makePath: (cid: T.Chat.ConversationIDKey) => RouteName,
+  const chatNavigateAppend = (
+    makePath: (cid: T.Chat.ConversationIDKey) => NavigateAppendType,
     replace?: boolean
-  ): void
-  function chatNavigateAppend<RouteName extends ParamRouteKeys>(
-    makePath: (cid: T.Chat.ConversationIDKey) => {name: RouteName; params: RootParamList[RouteName]},
-    replace?: boolean
-  ): void
-  function chatNavigateAppend(
-    makePath:
-      | ((cid: T.Chat.ConversationIDKey) => NoParamRouteKeys)
-      | ((cid: T.Chat.ConversationIDKey) => {name: ParamRouteKeys; params: object | undefined}),
-    replace?: boolean
-  ) {
+  ) => {
     navigateAppend(makePath(cid) as never, replace)
   }
   return chatNavigateAppend

shared/teams/routes.tsx

@@ -12,11 +12,6 @@ import {useModalHeaderState} from '@/stores/modal-header'
 import teamsRootGetOptions from './get-options'
 import {defineRouteMap} from '@/constants/types/router'
 
-type TeamRouteParams = {
-  teamID: T.Teams.TeamID
-  initialTab?: T.Teams.TabKey
-}
-
 const AddToChannelsHeaderTitle = ({teamID}: {teamID: T.Teams.TeamID}) => {
   const title = useModalHeaderState(s => s.title)
   return <ModalTitle teamID={teamID} title={title || 'Browse all channels'} />

shared/util/safe-navigation.tsx

@@ -1,18 +1,18 @@
 import * as C from '@/constants'
 import {useIsFocused} from '@react-navigation/core'
-import type {NoParamRouteKeys, ParamRouteKeys, RootParamList} from '@/router-v2/route-params'
+import type {AllOptionalParamRouteKeys, NoParamRouteKeys, ParamRouteKeys, RootParamList} from '@/router-v2/route-params'
 
 export const useSafeNavigation = () => {
   const isFocused = useIsFocused()
   const navigateUp = C.Router2.navigateUp
   const navigateAppend = C.Router2.navigateAppend
-  function safeNavigateAppend<RouteName extends NoParamRouteKeys>(path: RouteName, replace?: boolean): void
+  function safeNavigateAppend<RouteName extends NoParamRouteKeys | AllOptionalParamRouteKeys>(path: RouteName, replace?: boolean): void
   function safeNavigateAppend<RouteName extends ParamRouteKeys>(
     path: {name: RouteName; params: RootParamList[RouteName]},
     replace?: boolean
   ): void
   function safeNavigateAppend(
-    path: NoParamRouteKeys | {name: ParamRouteKeys; params: object | undefined},
+    path: NoParamRouteKeys | AllOptionalParamRouteKeys | {name: ParamRouteKeys; params: object | undefined},
     replace?: boolean
   ) {
     return isFocused && navigateAppend(path as never, replace)

skills-lock.json

@@ -15,6 +15,16 @@
       "source": "react-navigation/skills",
       "sourceType": "github",
       "computedHash": "49e493a5e878c7ef4e77dd7b5ed98c477c6a815617351c337c9cd374414669f3"
+    },
+    "vercel-react-best-practices": {
+      "source": "vercel-labs/agent-skills",
+      "sourceType": "github",
+      "computedHash": "1be892a3ea68b74654326ef836a58dd528d99ae0ab8d879764e2519c39068e67"
+    },
+    "vercel-react-native-skills": {
+      "source": "vercel-labs/agent-skills",
+      "sourceType": "github",
+      "computedHash": "2e9088a7333666d8c2833b8ff58bd51b955501c42b4c7244f72b4cbf22dafcc4"
     }
   }
 }