@react-navigation/core 8.0.0-alpha.4 → 8.0.0-alpha.5

package/src/getActionFromState.tsx

@@ -10,12 +10,12 @@ import type {
 import type { NavigatorScreenParams, PathConfig, PathConfigMap } from './types';
 
 type ConfigItem = {
-  initialRouteName?: string;
-  screens?: Record<string, ConfigItem>;
+  initialRouteName?: string | undefined;
+  screens?: Record<string, ConfigItem> | undefined;
 };
 
 type Options = {
-  initialRouteName?: string;
+  initialRouteName?: string | undefined;
   screens: PathConfigMap<object>;
 };
 
@@ -23,8 +23,8 @@ type NavigateAction<State extends NavigationState> = {
   type: 'NAVIGATE';
   payload: {
     name: string;
-    params?: NavigatorScreenParams<State>;
-    path?: string;
+    params?: NavigatorScreenParams<State> | undefined;
+    path?: string | undefined;
   };
 };
 
@@ -69,8 +69,8 @@ export function getActionFromState(
     | {
         name: string;
         params: NavigatorScreenParams<ParamListBase>;
-        path?: string;
-        pop?: boolean;
+        path?: string | undefined;
+        pop?: boolean | undefined;
       }
     | undefined = route
     ? { name: route.name, path: route.path, params }

package/src/getPathFromState.tsx

@@ -6,12 +6,13 @@ import type {
 import * as queryString from 'query-string';
 
 import { getPatternParts, type PatternPart } from './getPatternParts';
+import { getStateFromRouteParams } from './getStateFromRouteParams';
 import type { PathConfig, PathConfigMap } from './types';
 import { validatePathConfig } from './validatePathConfig';
 
 type Options<ParamList extends {}> = {
-  path?: string;
-  initialRouteName?: string;
+  path?: string | undefined;
+  initialRouteName?: string | undefined;
   screens: PathConfigMap<ParamList>;
 };
 
@@ -20,12 +21,14 @@ type State = NavigationState | Omit<PartialState<NavigationState>, 'stale'>;
 type StringifyConfig = Record<string, ((value: unknown) => string) | undefined>;
 
 type ConfigItem = {
-  parts?: PatternPart[];
-  stringify?: StringifyConfig;
-  screens?: Record<string, ConfigItem>;
+  parts?: PatternPart[] | undefined;
+  stringify?: StringifyConfig | undefined;
+  screens?: Record<string, ConfigItem> | undefined;
 };
 
-const getActiveRoute = (state: State): { name: string; params?: object } => {
+const getActiveRoute = (
+  state: State
+): { name: string; params?: object | undefined } => {
   const route =
     typeof state.index === 'number'
       ? state.routes[state.index]
@@ -57,6 +60,46 @@ const getNormalizedConfigs = (options?: Options<{}>) => {
   return normalizedConfigs;
 };
 
+const getTransformedState = (
+  state: State,
+  configs: Record<string, ConfigItem> | undefined
+): Omit<PartialState<NavigationState>, 'stale'> => {
+  const routes = state.routes.map(
+    (route): Omit<PartialState<NavigationState>, 'stale'>['routes'][number] => {
+      if (
+        route.state ||
+        (configs?.[route.name]?.screens &&
+          route.params &&
+          (('screen' in route.params &&
+            typeof route.params.screen === 'string' &&
+            configs[route.name].screens?.[route.params.screen]) ||
+            'state' in route.params))
+      ) {
+        const nestedState: State | undefined =
+          route.state ?? getStateFromRouteParams(route.params);
+
+        if (nestedState) {
+          return {
+            ...route,
+            state: getTransformedState(
+              nestedState,
+              configs?.[route.name]?.screens
+            ),
+          };
+        }
+      }
+
+      // @ts-expect-error route.state is handled in previous condition
+      return route;
+    }
+  );
+
+  return {
+    ...state,
+    routes,
+  };
+};
+
 /**
  * Utility to serialize a navigation state object to a path string.
  *
@@ -101,9 +144,10 @@ export function getPathFromState<ParamList extends {}>(
   }
 
   const configs = getNormalizedConfigs(options);
+  const transformedState = getTransformedState(state, configs);
 
   let path = '/';
-  let current: State | undefined = state;
+  let current: State | undefined = transformedState;
 
   const allParams: Record<string, string> = {};
 
@@ -118,7 +162,7 @@ export function getPathFromState<ParamList extends {}>(
     let focusedParams: Record<string, string> | undefined;
     let currentOptions = configs;
 
-    const focusedRoute = getActiveRoute(state);
+    const focusedRoute = getActiveRoute(transformedState);
 
     // Keep all the route names that appeared during going deeper in config in case the pattern is resolved to undefined
     const nestedRouteNames = [];

package/src/getStateFromPath.tsx

@@ -11,23 +11,36 @@ import { findFocusedRoute } from './findFocusedRoute';
 import { getPatternParts, type PatternPart } from './getPatternParts';
 import { isArrayEqual } from './isArrayEqual';
 import type { PathConfig, PathConfigMap } from './types';
+import type {
+  StandardSchemaV1,
+  StandardSchemaValidationResult,
+} from './utilities';
 import { validatePathConfig } from './validatePathConfig';
 
 type Options<ParamList extends {}> = {
-  path?: string;
-  initialRouteName?: string;
+  path?: string | undefined;
+  initialRouteName?: string | undefined;
   screens: PathConfigMap<ParamList>;
 };
 
-type ParseConfig = Record<string, ((value: string) => unknown) | undefined>;
+type ParseConfigValue =
+  | ((value: string) => unknown)
+  | StandardSchemaV1<unknown, unknown>;
+
+type ParseConfig = Record<string, ParseConfigValue | undefined>;
+
+type RouteParseConfig = {
+  parseConfig?: ParseConfig | undefined;
+  pathParamNames: Set<string>;
+};
 
 type RouteConfig = {
   screen: string;
-  regex?: RegExp;
+  regex?: RegExp | undefined;
   segments: string[];
-  params: { screen: string; name?: string; index: number }[];
+  params: { screen: string; name?: string | undefined; index: number }[];
   routeNames: string[];
-  parse?: ParseConfig;
+  parse?: ParseConfig | undefined;
 };
 
 type InitialRouteConfig = {
@@ -36,12 +49,12 @@ type InitialRouteConfig = {
 };
 
 type ResultState = PartialState<NavigationState> & {
-  state?: ResultState;
+  state?: ResultState | undefined;
 };
 
 type ParsedRoute = {
   name: string;
-  path?: string;
+  path?: string | undefined;
   params?: Record<string, unknown> | undefined;
 };
 
@@ -50,6 +63,47 @@ type ConfigResources = {
   configs: RouteConfig[];
 };
 
+const INVALID_SCHEMA_RESULT_ERROR =
+  'Invalid validation result from schema. It should be an object with either "value" or "issues" property and cannot be asynchronous.';
+
+const INVALID_PARSER_ERROR =
+  'Invalid parser. Expected a function or a Standard Schema V1 object.';
+
+const PARAM_GROUP_PREFIX = 'param_';
+
+const getStandardSchema = (parser: ParseConfigValue) => {
+  if (
+    '~standard' in parser &&
+    typeof parser['~standard'] === 'object' &&
+    parser['~standard'] !== null &&
+    'version' in parser['~standard'] &&
+    parser['~standard'].version === 1 &&
+    'validate' in parser['~standard'] &&
+    typeof parser['~standard'].validate === 'function'
+  ) {
+    return parser['~standard'];
+  }
+
+  return undefined;
+};
+
+const getValidationResult = (
+  schema: StandardSchemaV1<unknown, unknown>['~standard'],
+  value: unknown
+): StandardSchemaValidationResult<unknown> => {
+  const result = schema.validate(value);
+
+  if (
+    result != null &&
+    typeof result === 'object' &&
+    ('value' in result || ('issues' in result && Array.isArray(result.issues)))
+  ) {
+    return result;
+  }
+
+  throw new Error(INVALID_SCHEMA_RESULT_ERROR);
+};
+
 /**
  * Utility to parse a path string to initial state object accepted by the container.
  * This is useful for deep linking when we need to handle the incoming URL.
@@ -136,25 +190,23 @@ export function getStateFromPath<ParamList extends {}>(
     return undefined;
   }
 
-  let result: PartialState<NavigationState> | undefined;
-  let current: PartialState<NavigationState> | undefined;
-
   // We match the whole path against the regex instead of segments
   // This makes sure matches such as wildcard will catch any unmatched routes, even if nested
-  const { routes, remainingPath } = matchAgainstConfigs(remaining, configs);
+  for (const config of configs) {
+    const routes = matchAgainstConfig(remaining, config, configs);
 
-  if (routes !== undefined) {
-    // This will always be empty if full path matched
-    current = createNestedStateObject(path, routes, initialRoutes, configs);
-    remaining = remainingPath;
-    result = current;
-  }
+    if (routes === undefined) {
+      continue;
+    }
 
-  if (current == null || result == null) {
-    return undefined;
+    const state = createNestedStateObject(path, routes, initialRoutes, configs);
+
+    if (state !== undefined) {
+      return state;
+    }
   }
 
-  return result;
+  return undefined;
 }
 
 /**
@@ -344,75 +396,101 @@ function getConfigsWithRegexes(configs: RouteConfig[]) {
   }));
 }
 
-const matchAgainstConfigs = (remaining: string, configs: RouteConfig[]) => {
-  let routes: ParsedRoute[] | undefined;
-  let remainingPath = remaining;
+const matchAgainstConfig = (
+  remaining: string,
+  config: RouteConfig,
+  configs: RouteConfig[]
+) => {
+  if (!config.regex) {
+    return undefined;
+  }
 
-  // Go through all configs, and see if the next path segment matches our regex
-  for (const config of configs) {
-    if (!config.regex) {
-      continue;
-    }
+  const match = remaining.match(config.regex);
 
-    const match = remainingPath.match(config.regex);
+  if (!match) {
+    return undefined;
+  }
 
-    // If our regex matches, we need to extract params from the path
-    if (match) {
-      routes = config.routeNames.map((routeName) => {
-        const routeConfig = configs.find((c) => {
-          // Check matching name AND pattern in case same screen is used at different levels in config
-          return (
-            c.screen === routeName &&
-            arrayStartsWith(config.segments, c.segments)
-          );
-        });
+  let validationFailed = false;
+  const matchedRoutes: ParsedRoute[] = [];
 
-        const params =
-          routeConfig && match.groups
-            ? Object.fromEntries(
-                Object.entries(match.groups)
-                  .map(([key, value]) => {
-                    const index = Number(key.replace('param_', ''));
-                    const param = routeConfig.params.find(
-                      (it) => it.index === index
-                    );
-
-                    if (param?.screen === routeName && param?.name) {
-                      return [param.name, value];
-                    }
-
-                    return null;
-                  })
-                  .filter((it) => it != null)
-                  .map(([key, value]) => {
-                    if (value == null) {
-                      return [key, undefined];
-                    }
-
-                    const decoded = decodeURIComponent(value);
-                    const parsed = routeConfig.parse?.[key]
-                      ? routeConfig.parse[key](decoded)
-                      : decoded;
-
-                    return [key, parsed];
-                  })
-              )
-            : undefined;
+  for (const routeName of config.routeNames) {
+    // Check matching name AND pattern in case same screen is used at different levels in config
+    const routeConfig = configs.find(
+      (c) =>
+        c.screen === routeName && arrayStartsWith(config.segments, c.segments)
+    );
 
-        if (params && Object.keys(params).length) {
-          return { name: routeName, params };
+    let params: Record<string, unknown> | undefined;
+
+    if (routeConfig && match.groups) {
+      const paramEntries: [string, unknown][] = [];
+
+      for (const [key, value] of Object.entries(match.groups)) {
+        const index = Number(key.replace(PARAM_GROUP_PREFIX, ''));
+        const param = routeConfig.params.find((it) => it.index === index);
+
+        if (param?.screen !== routeName || !param.name) {
+          continue;
         }
 
-        return { name: routeName };
-      });
+        if (value == null) {
+          paramEntries.push([param.name, undefined]);
+          continue;
+        }
+
+        const decoded = decodeURIComponent(value);
+        const parser = routeConfig.parse?.[param.name];
 
-      remainingPath = remainingPath.replace(match[0], '');
+        if (!parser) {
+          paramEntries.push([param.name, decoded]);
+          continue;
+        }
 
-      break;
+        const schema = getStandardSchema(parser);
+
+        if (schema) {
+          const result = getValidationResult(schema, decoded);
+
+          if (result.issues) {
+            validationFailed = true;
+            break;
+          }
+
+          paramEntries.push([param.name, result.value]);
+          continue;
+        }
+
+        if (typeof parser === 'function') {
+          paramEntries.push([param.name, parser(decoded)]);
+          continue;
+        }
+
+        throw new Error(INVALID_PARSER_ERROR);
+      }
+
+      if (validationFailed) {
+        // A failed param validation invalidates the whole nested route chain for this config.
+        break;
+      }
+
+      if (paramEntries.length) {
+        params = Object.fromEntries(paramEntries);
+      }
     }
+
+    if (params && Object.keys(params).length) {
+      matchedRoutes.push({ name: routeName, params });
+    } else {
+      matchedRoutes.push({ name: routeName });
+    }
+  }
+
+  if (validationFailed) {
+    return undefined;
   }
 
-  return { routes, remainingPath };
+  return matchedRoutes;
 };
 
 const createNormalizedConfigs = (
@@ -551,7 +629,7 @@ const createConfigItem = (
             if (it.param) {
               const reg = it.regex || '[^/]+';
 
-              return `(((?<param_${i}>${reg})\\/)${it.optional ? '?' : ''})`;
+              return `(((?<${PARAM_GROUP_PREFIX}${i}>${reg})\\/)${it.optional ? '?' : ''})`;
             }
 
             return `${it.segment === '*' ? '.*' : escape(it.segment)}\\/`;
@@ -586,10 +664,22 @@ const createConfigItem = (
 const findParseConfigForRoute = (
   routeName: string,
   flatConfig: RouteConfig[]
-): ParseConfig | undefined => {
+): RouteParseConfig | undefined => {
   for (const config of flatConfig) {
     if (routeName === config.routeNames[config.routeNames.length - 1]) {
-      return config.parse;
+      return {
+        parseConfig: config.parse,
+        pathParamNames: new Set(
+          config.params
+            .filter(
+              (
+                param
+              ): param is { screen: string; name: string; index: number } =>
+                param.screen === routeName && typeof param.name === 'string'
+            )
+            .map((param) => param.name)
+        ),
+      };
     }
   }
 
@@ -658,7 +748,7 @@ const createNestedStateObject = (
   routes: ParsedRoute[],
   initialRoutes: InitialRouteConfig[],
   flatConfig?: RouteConfig[]
-) => {
+): InitialState | undefined => {
   let route = routes.shift() as ParsedRoute;
   const parentScreens: string[] = [];
 
@@ -699,33 +789,101 @@ const createNestedStateObject = (
   route = findFocusedRoute(state) as ParsedRoute;
   route.path = path.replace(/\/$/, '');
 
-  const params = parseQueryParams(
+  const parseConfigForRoute = flatConfig
+    ? findParseConfigForRoute(route.name, flatConfig)
+    : undefined;
+
+  const queryParams = parseQueryParams(
     path,
-    flatConfig ? findParseConfigForRoute(route.name, flatConfig) : undefined
+    parseConfigForRoute?.parseConfig,
+    parseConfigForRoute?.pathParamNames
   );
 
-  if (params) {
-    route.params = { ...route.params, ...params };
+  if (!queryParams.valid) {
+    return undefined;
+  }
+
+  if (queryParams.params) {
+    route.params = { ...route.params, ...queryParams.params };
   }
 
   return state;
 };
 
-const parseQueryParams = (path: string, parseConfig?: ParseConfig) => {
+const parseQueryParams = (
+  path: string,
+  parseConfig?: ParseConfig,
+  pathParamNames: Set<string> = new Set()
+):
+  | { valid: true; params?: Record<string, unknown> | undefined }
+  | { valid: false } => {
   const query = path.split('?')[1];
   const params: Record<string, unknown> = queryString.parse(query);
 
+  // Path params should always win over same-named query params.
+  for (const name of pathParamNames) {
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete params[name];
+  }
+
   if (parseConfig) {
-    Object.keys(params).forEach((name) => {
-      if (
-        Object.hasOwnProperty.call(parseConfig, name) &&
-        parseConfig[name] &&
-        typeof params[name] === 'string'
-      ) {
-        params[name] = parseConfig[name](params[name]);
+    for (const [name, parser] of Object.entries(parseConfig)) {
+      if (!parser || pathParamNames.has(name)) {
+        continue;
       }
-    });
+
+      const schema = getStandardSchema(parser);
+
+      if (!Object.hasOwn(params, name)) {
+        if (!schema) {
+          continue;
+        }
+
+        const result = getValidationResult(schema, undefined);
+
+        if (result.issues) {
+          return { valid: false };
+        }
+
+        if (result.value !== undefined) {
+          params[name] = result.value;
+        }
+
+        continue;
+      }
+
+      if (schema) {
+        const result = getValidationResult(schema, params[name]);
+
+        if (result.issues) {
+          return { valid: false };
+        }
+
+        params[name] = result.value;
+        continue;
+      }
+
+      const value = Array.isArray(params[name])
+        ? params[name][0]
+        : params[name];
+
+      if (typeof value !== 'string') {
+        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+        delete params[name];
+        continue;
+      }
+
+      if (typeof parser === 'function') {
+        params[name] = parser(value);
+        continue;
+      }
+
+      throw new Error(INVALID_PARSER_ERROR);
+    }
   }
 
-  return Object.keys(params).length ? params : undefined;
+  return {
+    valid: true,
+    params: Object.keys(params).length ? params : undefined,
+  };
 };

package/src/getStateFromRouteParams.tsx

@@ -0,0 +1,60 @@
+import type { NavigationState, PartialState } from '@react-navigation/routers';
+
+export function getStateFromRouteParams(
+  params: object | undefined
+): PartialState<NavigationState> | NavigationState | undefined {
+  if (params == null || typeof params !== 'object') {
+    return undefined;
+  }
+
+  if (
+    'state' in params &&
+    params.state &&
+    typeof params.state === 'object' &&
+    'routes' in params.state &&
+    Array.isArray(params.state.routes) &&
+    params.state.routes.every(
+      (route) =>
+        typeof route === 'object' &&
+        route != null &&
+        'name' in route &&
+        typeof route.name === 'string'
+    )
+  ) {
+    // @ts-expect-error this is fine 🔥
+    return params.state;
+  }
+
+  if (
+    'screen' in params &&
+    params.screen &&
+    typeof params.screen === 'string'
+  ) {
+    return {
+      routes: [
+        {
+          name: params.screen,
+          params:
+            'params' in params &&
+            typeof params.params === 'object' &&
+            params.params != null
+              ? params.params
+              : undefined,
+          path:
+            'path' in params && typeof params.path === 'string'
+              ? params.path
+              : undefined,
+          // @ts-expect-error this is fine 🔥
+          state:
+            'params' in params &&
+            typeof params.params === 'object' &&
+            params.params != null
+              ? getStateFromRouteParams(params.params)
+              : undefined,
+        },
+      ],
+    };
+  }
+
+  return undefined;
+}

package/src/index.tsx

@@ -44,5 +44,6 @@ export { usePreventRemove } from './usePreventRemove';
 export { usePreventRemoveContext } from './usePreventRemoveContext';
 export { useRoute } from './useRoute';
 export { useStateForPath } from './useStateForPath';
+export type { QueryParamInput, StandardSchemaV1 } from './utilities';
 export { validatePathConfig } from './validatePathConfig';
 export * from '@react-navigation/routers';