@react-navigation/core 8.0.0-alpha.33 → 8.0.0-alpha.35

package/lib/module/getPatternParts.js

@@ -10,6 +10,7 @@ export function getPatternParts(path) {
   };
   let isRegex = false;
   let isParam = false;
+  let hasRepeat = false;
   let isEscaped = false;
   let isInCharClass = false;
   let regexInnerParens = 0;
@@ -44,7 +45,7 @@ export function getPatternParts(path) {
           // The ')' is part of the regex if we're already inside one
           regexInnerParens--;
         } else {
-          current.regex += char;
+          current.pattern += char;
           isRegex = false;
           isParam = false;
         }
@@ -52,12 +53,19 @@ export function getPatternParts(path) {
         throw new Error(`Encountered ')' without preceding '(' in path: ${path}`);
       }
     } else if (char === '?' && !isRegex) {
-      if (current.param) {
+      if (current.name) {
         isParam = false;
         current.optional = true;
       } else {
         throw new Error(`Encountered '?' without preceding ':' in path: ${path}`);
       }
+    } else if (current.name && !isRegex && (char === '*' || char === '+') && (path[i + 1] == null || path[i + 1] === '/' || path[i + 1] === '?' || path[i + 1] === '*' || path[i + 1] === '+')) {
+      if (current.optional || path[i + 1] !== undefined && path[i + 1] !== '/') {
+        throw new Error(`Cannot combine path param modifiers in path: ${path}`);
+      }
+      isParam = false;
+      current.repeat = char === '*' ? 'zero-or-more' : 'one-or-more';
+      hasRepeat = true;
     } else if (char == null || char === '/' && !isRegex) {
       isParam = false;
 
@@ -66,11 +74,11 @@ export function getPatternParts(path) {
       if (current.segment === '') {
         continue;
       }
-      if (current.param) {
-        current.param = current.param.replace(/^:/, '');
+      if (current.name) {
+        current.name = current.name.replace(/^:/, '');
       }
-      if (current.regex) {
-        current.regex = current.regex.replace(/^\(/, '').replace(/\)$/, '');
+      if (current.pattern) {
+        current.pattern = current.pattern.replace(/^\(/, '').replace(/\)$/, '');
       }
       parts.push(current);
       if (char == null) {
@@ -81,8 +89,8 @@ export function getPatternParts(path) {
       };
     }
     if (isRegex) {
-      current.regex = current.regex || '';
-      current.regex += char;
+      current.pattern = current.pattern || '';
+      current.pattern += char;
 
       // Track escapes and character classes so parens inside them are not special
       if (isEscaped) {
@@ -96,22 +104,45 @@ export function getPatternParts(path) {
       }
     }
     if (isParam && !isRegex) {
-      current.param = current.param || '';
-      current.param += char;
+      current.name = current.name || '';
+      current.name += char;
     }
   }
   if (isRegex) {
     throw new Error(`Could not find closing ')' in path: ${path}`);
   }
-  const params = parts.map(part => part.param).filter(Boolean);
+  const params = parts.map(part => part.name).filter(Boolean);
   for (const [index, param] of params.entries()) {
     if (params.indexOf(param) !== index) {
       throw new Error(`Duplicate param name '${param}' found in path: ${path}`);
     }
   }
+  if (hasRepeat) {
+    validateRepeatedParts(parts, path);
+  }
   return parts;
 }
+function validateRepeatedParts(parts, path) {
+  let variablePart;
+  for (const part of parts) {
+    if (!part.name && part.segment !== '*') {
+      variablePart = undefined;
+      continue;
+    }
+    if (!part.repeat && !part.optional && part.segment !== '*') {
+      continue;
+    }
+    if (variablePart && (variablePart.repeat || part.repeat)) {
+      throw new Error(`A repeated param must be separated from optional, repeated, or wildcard segments by a static segment: ${path}`);
+    }
+    variablePart = part;
+  }
+}
 export function combinePatternParts(parentParts, parts, exact = false) {
-  return exact ? parts : [...parentParts, ...parts];
+  const combined = exact ? parts : [...parentParts, ...parts];
+  if (combined.some(part => part.repeat)) {
+    validateRepeatedParts(combined, combined.map(part => part.segment).join('/'));
+  }
+  return combined;
 }
 //# sourceMappingURL=getPatternParts.js.map

package/lib/module/getPatternParts.js.map

@@ -1 +1 @@
-{"version":3,"names":["getPatternParts","path","parts","current","segment","isRegex","isParam","isEscaped","isInCharClass","regexInnerParens","i","length","char","Error","regex","param","optional","replace","push","params","map","part","filter","Boolean","index","entries","indexOf","combinePatternParts","parentParts","exact"],"sourceRoot":"../../src","sources":["getPatternParts.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getPatternParts","path","parts","current","segment","isRegex","isParam","hasRepeat","isEscaped","isInCharClass","regexInnerParens","i","length","char","Error","pattern","name","optional","undefined","repeat","replace","push","params","map","part","filter","Boolean","index","param","entries","indexOf","validateRepeatedParts","variablePart","combinePatternParts","parentParts","exact","combined","some","join"],"sourceRoot":"../../src","sources":["getPatternParts.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/getStateFromPath.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import escape from 'escape-string-regexp';
 import queryString from 'query-string';
 import { arrayStartsWith } from "./arrayStartsWith.js";
 import { combinePatternParts, getPatternParts } from "./getPatternParts.js";
@@ -10,11 +9,34 @@ const INVALID_SCHEMA_RESULT_ERROR = 'Invalid validation result from schema. It s
 const INVALID_PARSER_ERROR = 'Invalid parser. Expected a function or a Standard Schema V1 object.';
 const PARAM_GROUP_PREFIX = 'param_';
 const NESTED_SCREEN_PARAM_NAMES = ['screen', 'params', 'initial', 'path', 'merge', 'pop'];
-const getStaticSegmentPattern = segment => Array.from(segment, char => {
-  const encoded = encodeURIComponent(char);
-  const percentEncoded = encoded === char ? `%${char.charCodeAt(0).toString(16).padStart(2, '0').toUpperCase()}` : encoded;
-  return `(?:${escape(char)}|${escape(percentEncoded)})`;
-}).join('');
+const REGEX_SYNTAX_CHAR = /[|\\{}()[\]^$+*?.]/;
+const HEX_DIGITS = '0123456789ABCDEF';
+const getStaticSegmentPattern = segment => {
+  let pattern = '';
+  for (const char of segment) {
+    const code = char.charCodeAt(0);
+    let escaped = char;
+
+    // A hyphen uses a hexadecimal escape because a regular backslash escape
+    // isn't valid outside character classes when a regex uses Unicode mode.
+    if (char === '-') {
+      escaped = '\\x2d';
+    } else {
+      // Other characters with special meaning in a regex can use a regular
+      // backslash escape so they are matched as literal characters.
+      if (REGEX_SYNTAX_CHAR.test(char)) {
+        escaped = `\\${char}`;
+      }
+    }
+
+    // ASCII characters have a single-byte percent-encoded form that can be
+    // built directly. Other characters need encodeURIComponent to encode all
+    // bytes in their UTF-8 representation.
+    const percentEncoded = char.length === 1 && code < 128 ? `%${HEX_DIGITS.charAt(code >> 4)}${HEX_DIGITS.charAt(code & 15)}` : encodeURIComponent(char);
+    pattern += `(?:${escaped}|${percentEncoded})`;
+  }
+  return pattern;
+};
 const getExplicitParamNames = parse => {
   const names = [];
   if (parse) {
@@ -65,6 +87,7 @@ export function getStateFromPath(path, options, previous) {
   const {
     initialRoutes,
     configs,
+    configsWithZeroOrMore,
     configsByScreen,
     configsByPattern,
     prefixRegex
@@ -122,9 +145,31 @@ export function getStateFromPath(path, options, previous) {
     const match = configs.find(config => config.pattern === '');
     if (match) {
       const config = resolveSharedConfig(match);
-      return createNestedStateObject(path, config.routeNames.map(name => ({
+      const state = createNestedStateObject(path, config.routeNames.map(name => ({
         name
       })), initialRoutes, config);
+      if (state) {
+        return state;
+      }
+    }
+    for (const config of configsWithZeroOrMore) {
+      const routes = matchAgainstConfig('', config, configsByScreen);
+      if (routes) {
+        let selectedConfig = resolveSharedConfig(config);
+        let selectedRoutes = routes;
+        if (selectedConfig !== config) {
+          const rematchedRoutes = matchAgainstConfig('', selectedConfig, configsByScreen);
+          if (rematchedRoutes === undefined) {
+            selectedConfig = config;
+          } else {
+            selectedRoutes = rematchedRoutes;
+          }
+        }
+        const state = createNestedStateObject(path, selectedRoutes, initialRoutes, selectedConfig);
+        if (state) {
+          return state;
+        }
+      }
     }
     return undefined;
   }
@@ -206,7 +251,11 @@ function prepareConfigResources(options) {
   }
   const configsByScreen = {};
   const configsByPattern = {};
+  const configsWithZeroOrMore = [];
   for (const c of configs) {
+    if (c.params.some(param => param.repeat === 'zero-or-more')) {
+      configsWithZeroOrMore.push(c);
+    }
     (configsByScreen[c.screen] ??= []).push(c);
     const existing = configsByPattern[c.pattern];
     if (existing) {
@@ -219,6 +268,7 @@ function prepareConfigResources(options) {
   return {
     initialRoutes,
     configs,
+    configsWithZeroOrMore,
     configsByScreen,
     configsByPattern,
     prefixRegex
@@ -238,7 +288,7 @@ function getSortedNormalizedConfigs(initialRoutes, screens = {}) {
   // Create a normalized configs array which will be easier to use
   const configs = [];
   for (const key in screens) {
-    configs.push(...createNormalizedConfigs(key, screens, initialRoutes, [], [], []));
+    setupNormalizedConfigs(key, screens, initialRoutes, configs, [], [], []);
   }
   for (let order = 0; order < configs.length; order++) {
     const config = configs[order];
@@ -248,15 +298,17 @@ function getSortedNormalizedConfigs(initialRoutes, screens = {}) {
   }
   return configs.sort((a, b) => {
     // Sort config from most specific to least specific:
-    // - more segments
     // - static segments
     // - params with regex
     // - regular params
+    // - one-or-more params
+    // - the end of the pattern
+    // - zero-or-more params
     // - wildcard
 
     // If 2 patterns are same, move the one with less route names up
     // This is an error state, so it's only useful for consistent error messages
-    if (isArrayEqual(a.segments, b.segments)) {
+    if (a.pattern === b.pattern && isArrayEqual(a.segments, b.segments)) {
       if (a.routeNames.length > b.routeNames.length && arrayStartsWith(a.routeNames, b.routeNames)) {
         return -1;
       }
@@ -265,73 +317,34 @@ function getSortedNormalizedConfigs(initialRoutes, screens = {}) {
       }
       return a.routeNames.length - b.routeNames.length || a.order - b.order;
     }
-
-    // If one of the patterns starts with the other, it's more exhaustive
-    // So move it up
-    if (arrayStartsWith(a.segments, b.segments)) {
-      return -1;
-    }
-    if (arrayStartsWith(b.segments, a.segments)) {
-      return 1;
-    }
     for (let i = 0; i < Math.max(a.segments.length, b.segments.length); i++) {
-      const aSegment = a.segments[i];
-      const bSegment = b.segments[i];
-
-      // if b is longer, b gets higher priority
-      if (aSegment == null) {
-        return 1;
-      }
-
-      // if a is longer, a gets higher priority
-      if (bSegment == null) {
-        return -1;
-      }
-      const aWildCard = aSegment === '*';
-      const bWildCard = bSegment === '*';
-      const aParam = aSegment.startsWith(':');
-      const bParam = bSegment.startsWith(':');
-      const aRegex = aParam && aSegment.includes('(');
-      const bRegex = bParam && bSegment.includes('(');
-
-      // if both are wildcard or regex, we compare next component
-      if (aWildCard && bWildCard || aRegex && bRegex) {
-        continue;
-      }
-
-      // if only a is wildcard, b gets higher priority
-      if (aWildCard && !bWildCard) {
-        return 1;
-      }
-
-      // if only b is wildcard, a gets higher priority
-      if (bWildCard && !aWildCard) {
-        return -1;
-      }
-
-      // If only a has a param, b gets higher priority
-      if (aParam && !bParam) {
-        return 1;
-      }
-
-      // If only b has a param, a gets higher priority
-      if (bParam && !aParam) {
-        return -1;
-      }
-
-      // if only a has regex, a gets higher priority
-      if (aRegex && !bRegex) {
-        return -1;
-      }
-
-      // if only b has regex, b gets higher priority
-      if (bRegex && !aRegex) {
-        return 1;
+      const rank = (a.segmentRanks[i] ?? 5) - (b.segmentRanks[i] ?? 5);
+      if (rank !== 0) {
+        return rank;
       }
     }
-    return a.segments.length - b.segments.length;
+    return a.order - b.order;
   });
 }
+const getSegmentRank = segment => {
+  if (segment === undefined) {
+    return 5;
+  }
+  if (segment === '*') {
+    return 8;
+  }
+  if (!segment.startsWith(':')) {
+    return 0;
+  }
+  const regex = segment.includes('(');
+  if (segment.endsWith('+')) {
+    return regex ? 3 : 4;
+  }
+  if (segment.endsWith('*')) {
+    return regex ? 6 : 7;
+  }
+  return regex ? 1 : 2;
+};
 
 // Throw if two configs resolve to the same pattern but conflicting screens
 function checkForDuplicatedConfigs(existing, config) {
@@ -370,23 +383,41 @@ const matchAgainstConfig = (remaining, config, configsByScreen) => {
         if (param.screen !== routeName) {
           continue;
         }
-        const value = match.groups[`${PARAM_GROUP_PREFIX}${param.index}`];
-        if (value == null) {
-          params[param.name] = undefined;
-          hasParams = true;
-          continue;
+        let value = match.groups[`${PARAM_GROUP_PREFIX}${param.index}`];
+        if (param.repeat && value != null) {
+          value = value.replace(/\/$/, '');
         }
         let decoded;
+        let decodedSegments;
         try {
-          decoded = decodeURIComponent(value);
+          if (param.repeat) {
+            if (value == null) {
+              decodedSegments = [];
+            } else {
+              decodedSegments = value.split('/').map(decodeURIComponent);
+            }
+            decoded = decodedSegments.join('/');
+          } else {
+            if (value == null) {
+              params[param.name] = undefined;
+              hasParams = true;
+              continue;
+            }
+            decoded = decodeURIComponent(value);
+          }
         } catch {
           return undefined;
         }
 
         // Percent-encoded values are matched permissively
         // So validate the decoded value against the custom regex
-        if (param.regex && value !== decoded && !param.regex.test(decoded)) {
-          return undefined;
+        if (param.regex) {
+          const regex = param.regex;
+          const values = decodedSegments ?? [decoded];
+          const rawValues = param.repeat ? value?.split('/') ?? [] : [value];
+          if (values.some((item, index) => item !== rawValues[index] && !regex.test(item))) {
+            return undefined;
+          }
         }
         const parser = routeConfig.parse?.[param.name];
         if (!parser) {
@@ -433,16 +464,47 @@ const matchAgainstConfig = (remaining, config, configsByScreen) => {
   }
   return matchedRoutes;
 };
-const createNormalizedConfigs = (screen, routeConfig, initials, parts, parentScreens, routeNames) => {
-  const configs = [];
+const getRoutePatternParts = (path, screen) => getPatternParts(path).map(part => {
+  const rank = getSegmentRank(part.segment);
+  if (part.name) {
+    return {
+      type: 'param',
+      screen,
+      segment: part.segment,
+      rank,
+      name: part.name,
+      ...(part.pattern ? {
+        pattern: part.pattern,
+        regex: new RegExp(`^(?:${part.pattern})$`)
+      } : null),
+      ...(part.optional ? {
+        optional: true
+      } : null),
+      ...(part.repeat ? {
+        repeat: part.repeat
+      } : null)
+    };
+  }
+  if (part.segment === '*') {
+    return {
+      type: 'wildcard',
+      segment: part.segment,
+      rank
+    };
+  }
+  return {
+    type: 'static',
+    segment: part.segment,
+    rank,
+    pattern: getStaticSegmentPattern(part.segment)
+  };
+});
+const setupNormalizedConfigs = (screen, routeConfig, initials, configs, parts, parentScreens, routeNames) => {
   routeNames.push(screen);
   parentScreens.push(screen);
   const config = routeConfig[screen];
   if (typeof config === 'string') {
-    const configParts = combinePatternParts(parts, getPatternParts(config).map(part => ({
-      ...part,
-      screen
-    })));
+    const configParts = combinePatternParts(parts, getRoutePatternParts(config, screen));
     configs.push(createConfigItem(screen, [...routeNames], configParts));
   } else if (typeof config === 'object') {
     // if an object is specified as the value (e.g. Foo: { ... }),
@@ -450,10 +512,7 @@ const createNormalizedConfigs = (screen, routeConfig, initials, parts, parentScr
     // it could have `screens` prop which has nested configs
     const nestedScreens = 'screens' in config ? config.screens : undefined;
     const hasNestedScreens = !!nestedScreens;
-    const currentParts = typeof config.path === 'string' ? combinePatternParts(parts, getPatternParts(config.path).map(part => ({
-      ...part,
-      screen
-    })), config.exact) : parts;
+    const currentParts = typeof config.path === 'string' ? combinePatternParts(parts, getRoutePatternParts(config.path, screen), config.exact) : parts;
     if (typeof config.path === 'string') {
       // We should add alias configs after the main config
       // So unless they are more specific, main config will be matched first
@@ -461,15 +520,9 @@ const createNormalizedConfigs = (screen, routeConfig, initials, parts, parentScr
       if (config.alias) {
         for (const alias of config.alias) {
           if (typeof alias === 'string') {
-            aliasConfigs.push(createConfigItem(screen, [...routeNames], combinePatternParts(parts, getPatternParts(alias).map(part => ({
-              ...part,
-              screen
-            }))), config.parse, hasNestedScreens, false));
+            aliasConfigs.push(createConfigItem(screen, [...routeNames], combinePatternParts(parts, getRoutePatternParts(alias, screen)), config.parse, hasNestedScreens, false));
           } else if (typeof alias === 'object') {
-            aliasConfigs.push(createConfigItem(screen, [...routeNames], combinePatternParts(parts, getPatternParts(alias.path).map(part => ({
-              ...part,
-              screen
-            })), alias.exact), alias.parse, hasNestedScreens, alias.shared === true));
+            aliasConfigs.push(createConfigItem(screen, [...routeNames], combinePatternParts(parts, getRoutePatternParts(alias.path, screen), alias.exact), alias.parse, hasNestedScreens, alias.shared === true));
           }
         }
       }
@@ -488,17 +541,16 @@ const createNormalizedConfigs = (screen, routeConfig, initials, parts, parentScr
         });
       }
       for (const nestedConfig in nestedScreens) {
-        const result = createNormalizedConfigs(nestedConfig, nestedScreens, initials, currentParts, [...parentScreens], routeNames);
-        configs.push(...result);
+        setupNormalizedConfigs(nestedConfig, nestedScreens, initials, configs, currentParts, [...parentScreens], routeNames);
       }
     }
   }
   routeNames.pop();
-  return configs;
 };
 const createConfigItem = (screen, routeNames, parts, parse, hasNestedScreens = false, shared = false) => {
   let regex;
   const segments = [];
+  const segmentRanks = [];
   const params = [];
   const pathParamNames = new Set();
   if (parts.length) {
@@ -506,24 +558,37 @@ const createConfigItem = (screen, routeNames, parts, parse, hasNestedScreens = f
     let index = 0;
     for (const part of parts) {
       segments.push(part.segment);
-      if (part.param) {
+      segmentRanks.push(part.rank);
+      if (part.type === 'param') {
         // A custom regex may not match the percent-encoded form of the value
         // So also accept segments containing an encoded character and validate them after decoding
-        const reg = part.regex ? `(?:${part.regex})|(?=[^/]*%[0-9A-F]{2})[^/]+` : '[^/]+';
-        regexString += `(((?<${PARAM_GROUP_PREFIX}${index}>${reg})\\/)${part.optional ? '?' : ''})`;
+        let reg = '[^/]+';
+        if (part.pattern) {
+          const encodedReg = `(?=[^/]*%[0-9A-F]{2})[^/]+`;
+          reg = part.repeat ? `(?:${encodedReg})|(?![^/]*%[0-9A-F]{2})(?:${part.pattern})` : `(?:${part.pattern})|${encodedReg}`;
+        }
+        if (part.repeat) {
+          const repeatedReg = `(?:(?:${reg})\\/)+`;
+          regexString += `(?<${PARAM_GROUP_PREFIX}${index}>${repeatedReg})${part.repeat === 'zero-or-more' ? '?' : ''}`;
+        } else {
+          regexString += `(((?<${PARAM_GROUP_PREFIX}${index}>${reg})\\/)${part.optional ? '?' : ''})`;
+        }
         params.push({
           index,
           screen: part.screen,
-          name: part.param,
-          regex: part.regex ? new RegExp(`^(?:${part.regex})$`) : undefined
+          name: part.name,
+          regex: part.regex,
+          ...(part.repeat ? {
+            repeat: part.repeat
+          } : {})
         });
         if (part.screen === screen) {
-          pathParamNames.add(part.param);
+          pathParamNames.add(part.name);
         }
-      } else if (part.segment === '*') {
+      } else if (part.type === 'wildcard') {
         regexString += `.*\\/`;
       } else {
-        regexString += `${getStaticSegmentPattern(part.segment)}\\/`;
+        regexString += `${part.pattern}\\/`;
       }
       index++;
     }
@@ -537,6 +602,7 @@ const createConfigItem = (screen, routeNames, parts, parse, hasNestedScreens = f
     regex,
     pattern,
     segments,
+    segmentRanks,
     params,
     routeNames,
     parse,