expo-router 4.0.21 → 4.0.22

package/build/onboard/Tutorial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tutorial.d.ts","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,wBAAgB,QAAQ,sBAgEvB"}
+{"version":3,"file":"Tutorial.d.ts","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAwB1B,wBAAgB,QAAQ,sBAgEvB"}

package/build/onboard/Tutorial.js

@@ -7,10 +7,22 @@ exports.Tutorial = void 0;
 const react_1 = __importDefault(require("react"));
 const react_native_1 = require("react-native");
 const react_native_safe_area_context_1 = require("react-native-safe-area-context");
-const createEntryFile_1 = require("./createEntryFile");
 const exports_1 = require("../exports");
+const getDevServer_1 = require("../getDevServer");
 const Pressable_1 = require("../views/Pressable");
 const canAutoTouchFile = process.env.EXPO_ROUTER_APP_ROOT != null;
+function createEntryFileAsync() {
+    if (process.env.NODE_ENV === 'production') {
+        // No dev server
+        console.warn('createEntryFile() cannot be used in production');
+        return;
+    }
+    // Pings middleware in the Expo CLI dev server.
+    return fetch((0, getDevServer_1.getDevServer)().url + '_expo/touch', {
+        method: 'POST',
+        body: JSON.stringify({ type: 'router_index' }),
+    });
+}
 function Tutorial() {
     react_1.default.useEffect(() => {
         if (react_native_1.Platform.OS === 'web') {
@@ -70,18 +82,18 @@ function Tutorial() {
 }
 exports.Tutorial = Tutorial;
 function getRootDir() {
-    const dir = process.env.EXPO_ROUTER_ABS_APP_ROOT;
-    if (dir.match(/\/src\/app$/)) {
+    const dir = process.env.EXPO_ROUTER_APP_ROOT ?? '';
+    if (/[\\/]src[\\/]app$/.test(dir)) {
         return 'src/app';
     }
-    else if (dir.match(/\/app$/)) {
+    else if (/[\\/]app$/.test(dir)) {
         return 'app';
     }
-    return dir.split('/').pop() ?? dir;
+    return dir.split(/[\\/]/).pop() ?? '';
 }
 function Button() {
     return (<Pressable_1.Pressable onPress={() => {
-            (0, createEntryFile_1.createEntryFileAsync)();
+            createEntryFileAsync();
         }} style={styles.button}>
       {({ pressed, hovered }) => (<react_native_1.View style={[
                 styles.buttonContainer,
@@ -107,8 +119,7 @@ function Button() {
                         native: { color: '#000' },
                     }),
             ]}>
-            <react_native_1.Text style={styles.textSecondary}>$</react_native_1.Text> touch {getRootDir()}
-            /index.tsx
+            <react_native_1.Text style={styles.textSecondary}>$</react_native_1.Text> touch {`${getRootDir()}/index.tsx`}
           </react_native_1.Text>
         </react_native_1.View>)}
     </Pressable_1.Pressable>);

package/build/onboard/Tutorial.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tutorial.js","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react';\nimport { Platform, StatusBar, StyleSheet, Text, View, Image } from 'react-native';\nimport { SafeAreaView } from 'react-native-safe-area-context';\n\nimport { createEntryFileAsync } from './createEntryFile';\nimport { Link } from '../exports';\nimport { Pressable } from '../views/Pressable';\n\nconst canAutoTouchFile = process.env.EXPO_ROUTER_APP_ROOT != null;\n\nexport function Tutorial() {\n  React.useEffect(() => {\n    if (Platform.OS === 'web') {\n      // Reset the route on web so the initial route isn't a 404 after\n      // the user has created the entry file.\n      // This is useful for cases where you are testing the tutorial.\n      // To test: touch the new file, then navigate to a missing route `/foobar`, then delete the app folder.\n      // you should see the tutorial again and be able to create the entry file once more.\n      if (typeof location !== 'undefined' && location.pathname !== '/') {\n        location.replace('/');\n      }\n      if (typeof window !== 'undefined' && typeof window.document !== 'undefined') {\n        window.document.title = 'Welcome to Expo';\n      }\n    }\n  }, []);\n\n  return (\n    <SafeAreaView style={styles.background}>\n      <StatusBar barStyle=\"light-content\" />\n      <View style={styles.container}>\n        <View style={styles.logotypeWrapper}>\n          <Image style={styles.logotype} source={require('expo-router/assets/logotype.png')} />\n        </View>\n        <Text role=\"heading\" aria-level={1} style={styles.title}>\n          Welcome to Expo\n        </Text>\n        <Text role=\"heading\" aria-level={2} style={[styles.subtitle, styles.textSecondary]}>\n          Start by creating a file{Platform.OS !== 'web' ? '\\n' : ' '}in the{' '}\n          <Text style={{ fontWeight: '600' }}>{getRootDir()}</Text> directory.\n        </Text>\n        <Text>\n          <Link\n            href=\"https://docs.expo.dev/router/introduction/\"\n            {...Platform.select({ web: { target: '_blank' }, native: { asChild: true } })}>\n            <Pressable>\n              {({ hovered, pressed }) => (\n                <Text\n                  style={[\n                    styles.link,\n                    Platform.select({\n                      web: {\n                        transitionDuration: '200ms',\n                        marginBottom: 12,\n                      },\n                    }),\n                    hovered && {\n                      opacity: 0.8,\n                      textDecorationLine: 'underline',\n                    },\n                    pressed && {\n                      opacity: 0.8,\n                    },\n                  ]}>\n                  Learn more about Expo Router in the documentation.\n                </Text>\n              )}\n            </Pressable>\n          </Link>\n        </Text>\n        {canAutoTouchFile && <Button />}\n      </View>\n    </SafeAreaView>\n  );\n}\n\nfunction getRootDir() {\n  const dir = process.env.EXPO_ROUTER_ABS_APP_ROOT!;\n  if (dir.match(/\\/src\\/app$/)) {\n    return 'src/app';\n  } else if (dir.match(/\\/app$/)) {\n    return 'app';\n  }\n  return dir.split('/').pop() ?? dir;\n}\n\nfunction Button() {\n  return (\n    <Pressable\n      onPress={() => {\n        createEntryFileAsync();\n      }}\n      style={styles.button}>\n      {({ pressed, hovered }) => (\n        <View\n          style={[\n            styles.buttonContainer,\n            hovered && {\n              backgroundColor: '#fff',\n            },\n            pressed &&\n              Platform.select({\n                web: {\n                  transform: 'scale(0.98)',\n                  transitionDuration: '200ms',\n                },\n                default: {\n                  backgroundColor: '#fff',\n                },\n              }),\n          ]}>\n          <Text\n            style={[\n              styles.code,\n              hovered && { color: '#000' },\n              pressed &&\n                Platform.select({\n                  native: { color: '#000' },\n                }),\n            ]}>\n            <Text style={styles.textSecondary}>$</Text> touch {getRootDir()}\n            /index.tsx\n          </Text>\n        </View>\n      )}\n    </Pressable>\n  );\n}\n\nconst styles = StyleSheet.create({\n  background: {\n    backgroundColor: '#000',\n    flex: 1,\n  },\n  container: {\n    flex: 1,\n    padding: 24,\n    paddingBottom: 64,\n    alignItems: 'center',\n    justifyContent: 'center',\n    marginHorizontal: 'auto',\n    gap: 16,\n    ...Platform.select({\n      web: {\n        maxWidth: 960,\n      },\n      native: {\n        width: '100%',\n      },\n    }),\n  },\n  logotypeWrapper: {\n    alignItems: 'center',\n    justifyContent: 'center',\n    backgroundColor: '#151718',\n    borderRadius: 12,\n    borderWidth: 1,\n    borderStyle: 'solid',\n    borderColor: '#313538',\n    width: 78,\n    height: 78,\n    marginBottom: 8,\n  },\n  logotype: {\n    width: 48,\n    height: 44,\n  },\n  title: {\n    ...Platform.select({\n      web: {\n        fontSize: 64,\n        lineHeight: 64,\n      },\n      default: {\n        fontSize: 56,\n        lineHeight: 56,\n      },\n    }),\n    color: '#fff',\n    fontWeight: '800',\n    textAlign: 'center',\n  },\n  buttonContainer: {\n    ...Platform.select({\n      web: {\n        transitionDuration: '200ms',\n      },\n    }),\n    backgroundColor: 'transparent',\n    borderColor: '#fff',\n    borderWidth: 2,\n    paddingVertical: 12,\n    paddingHorizontal: 24,\n    borderRadius: 8,\n  },\n  button: {\n    ...Platform.select({\n      web: {\n        marginTop: 12,\n      },\n      native: {\n        position: 'absolute',\n        bottom: 24,\n        left: 32,\n        right: 32,\n        overflow: 'hidden',\n      },\n    }),\n  },\n  code: {\n    ...Platform.select({\n      web: {\n        transitionDuration: '200ms',\n        fontFamily: 'Courier, monospace',\n      },\n      default: {\n        fontFamily: Platform.select({\n          ios: 'Courier New',\n          android: 'monospace',\n        }),\n      },\n    }),\n    color: '#fff',\n    textAlign: 'center',\n    userSelect: 'none',\n    fontSize: 18,\n    fontWeight: 'bold',\n  },\n  subtitle: {\n    fontSize: 34,\n    fontWeight: '200',\n    textAlign: 'center',\n  },\n  link: {\n    fontSize: 20,\n    lineHeight: 26,\n    textAlign: 'center',\n    color: '#52a9ff',\n    marginTop: 12,\n    ...Platform.select({\n      web: {\n        marginBottom: 24,\n      },\n    }),\n  },\n  textSecondary: {\n    color: '#9ba1a6',\n  },\n});\n"]}
+{"version":3,"file":"Tutorial.js","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react';\nimport { Platform, StatusBar, StyleSheet, Text, View, Image } from 'react-native';\nimport { SafeAreaView } from 'react-native-safe-area-context';\n\nimport { Link } from '../exports';\nimport { getDevServer } from '../getDevServer';\nimport { Pressable } from '../views/Pressable';\n\nconst canAutoTouchFile = process.env.EXPO_ROUTER_APP_ROOT != null;\n\nfunction createEntryFileAsync() {\n  if (process.env.NODE_ENV === 'production') {\n    // No dev server\n    console.warn('createEntryFile() cannot be used in production');\n    return;\n  }\n\n  // Pings middleware in the Expo CLI dev server.\n  return fetch(getDevServer().url + '_expo/touch', {\n    method: 'POST',\n    body: JSON.stringify({ type: 'router_index' }),\n  });\n}\n\nexport function Tutorial() {\n  React.useEffect(() => {\n    if (Platform.OS === 'web') {\n      // Reset the route on web so the initial route isn't a 404 after\n      // the user has created the entry file.\n      // This is useful for cases where you are testing the tutorial.\n      // To test: touch the new file, then navigate to a missing route `/foobar`, then delete the app folder.\n      // you should see the tutorial again and be able to create the entry file once more.\n      if (typeof location !== 'undefined' && location.pathname !== '/') {\n        location.replace('/');\n      }\n      if (typeof window !== 'undefined' && typeof window.document !== 'undefined') {\n        window.document.title = 'Welcome to Expo';\n      }\n    }\n  }, []);\n\n  return (\n    <SafeAreaView style={styles.background}>\n      <StatusBar barStyle=\"light-content\" />\n      <View style={styles.container}>\n        <View style={styles.logotypeWrapper}>\n          <Image style={styles.logotype} source={require('expo-router/assets/logotype.png')} />\n        </View>\n        <Text role=\"heading\" aria-level={1} style={styles.title}>\n          Welcome to Expo\n        </Text>\n        <Text role=\"heading\" aria-level={2} style={[styles.subtitle, styles.textSecondary]}>\n          Start by creating a file{Platform.OS !== 'web' ? '\\n' : ' '}in the{' '}\n          <Text style={{ fontWeight: '600' }}>{getRootDir()}</Text> directory.\n        </Text>\n        <Text>\n          <Link\n            href=\"https://docs.expo.dev/router/introduction/\"\n            {...Platform.select({ web: { target: '_blank' }, native: { asChild: true } })}>\n            <Pressable>\n              {({ hovered, pressed }) => (\n                <Text\n                  style={[\n                    styles.link,\n                    Platform.select({\n                      web: {\n                        transitionDuration: '200ms',\n                        marginBottom: 12,\n                      },\n                    }),\n                    hovered && {\n                      opacity: 0.8,\n                      textDecorationLine: 'underline',\n                    },\n                    pressed && {\n                      opacity: 0.8,\n                    },\n                  ]}>\n                  Learn more about Expo Router in the documentation.\n                </Text>\n              )}\n            </Pressable>\n          </Link>\n        </Text>\n        {canAutoTouchFile && <Button />}\n      </View>\n    </SafeAreaView>\n  );\n}\n\nfunction getRootDir() {\n  const dir = process.env.EXPO_ROUTER_APP_ROOT ?? '';\n  if (/[\\\\/]src[\\\\/]app$/.test(dir)) {\n    return 'src/app';\n  } else if (/[\\\\/]app$/.test(dir)) {\n    return 'app';\n  }\n  return dir.split(/[\\\\/]/).pop() ?? '';\n}\n\nfunction Button() {\n  return (\n    <Pressable\n      onPress={() => {\n        createEntryFileAsync();\n      }}\n      style={styles.button}>\n      {({ pressed, hovered }) => (\n        <View\n          style={[\n            styles.buttonContainer,\n            hovered && {\n              backgroundColor: '#fff',\n            },\n            pressed &&\n              Platform.select({\n                web: {\n                  transform: 'scale(0.98)',\n                  transitionDuration: '200ms',\n                },\n                default: {\n                  backgroundColor: '#fff',\n                },\n              }),\n          ]}>\n          <Text\n            style={[\n              styles.code,\n              hovered && { color: '#000' },\n              pressed &&\n                Platform.select({\n                  native: { color: '#000' },\n                }),\n            ]}>\n            <Text style={styles.textSecondary}>$</Text> touch {`${getRootDir()}/index.tsx`}\n          </Text>\n        </View>\n      )}\n    </Pressable>\n  );\n}\n\nconst styles = StyleSheet.create({\n  background: {\n    backgroundColor: '#000',\n    flex: 1,\n  },\n  container: {\n    flex: 1,\n    padding: 24,\n    paddingBottom: 64,\n    alignItems: 'center',\n    justifyContent: 'center',\n    marginHorizontal: 'auto',\n    gap: 16,\n    ...Platform.select({\n      web: {\n        maxWidth: 960,\n      },\n      native: {\n        width: '100%',\n      },\n    }),\n  },\n  logotypeWrapper: {\n    alignItems: 'center',\n    justifyContent: 'center',\n    backgroundColor: '#151718',\n    borderRadius: 12,\n    borderWidth: 1,\n    borderStyle: 'solid',\n    borderColor: '#313538',\n    width: 78,\n    height: 78,\n    marginBottom: 8,\n  },\n  logotype: {\n    width: 48,\n    height: 44,\n  },\n  title: {\n    ...Platform.select({\n      web: {\n        fontSize: 64,\n        lineHeight: 64,\n      },\n      default: {\n        fontSize: 56,\n        lineHeight: 56,\n      },\n    }),\n    color: '#fff',\n    fontWeight: '800',\n    textAlign: 'center',\n  },\n  buttonContainer: {\n    ...Platform.select({\n      web: {\n        transitionDuration: '200ms',\n      },\n    }),\n    backgroundColor: 'transparent',\n    borderColor: '#fff',\n    borderWidth: 2,\n    paddingVertical: 12,\n    paddingHorizontal: 24,\n    borderRadius: 8,\n  },\n  button: {\n    ...Platform.select({\n      web: {\n        marginTop: 12,\n      },\n      native: {\n        position: 'absolute',\n        bottom: 24,\n        left: 32,\n        right: 32,\n        overflow: 'hidden',\n      },\n    }),\n  },\n  code: {\n    ...Platform.select({\n      web: {\n        transitionDuration: '200ms',\n        fontFamily: 'Courier, monospace',\n      },\n      default: {\n        fontFamily: Platform.select({\n          ios: 'Courier New',\n          android: 'monospace',\n        }),\n      },\n    }),\n    color: '#fff',\n    textAlign: 'center',\n    userSelect: 'none',\n    fontSize: 18,\n    fontWeight: 'bold',\n  },\n  subtitle: {\n    fontSize: 34,\n    fontWeight: '200',\n    textAlign: 'center',\n  },\n  link: {\n    fontSize: 20,\n    lineHeight: 26,\n    textAlign: 'center',\n    color: '#52a9ff',\n    marginTop: 12,\n    ...Platform.select({\n      web: {\n        marginBottom: 24,\n      },\n    }),\n  },\n  textSecondary: {\n    color: '#9ba1a6',\n  },\n});\n"]}

package/build/typed-routes/generate.js

@@ -49,14 +49,14 @@ function getTypedRoutesDeclarationFile(ctx, { partialTypedGroups = false, testIg
             .map((param) => {
             const key = param.startsWith('...') ? param.slice(3) : param;
             const value = param.startsWith('...') ? '(string | number)[]' : 'string | number';
-            return `${key}: ${value};`;
+            return `${contextKeyToProperty(key)}: ${value};`;
         })
             .join('');
         const outputParams = paramsNames
             .map((param) => {
             const key = param.startsWith('...') ? param.slice(3) : param;
             const value = param.startsWith('...') ? 'string[]' : 'string';
-            return `${key}: ${value};`;
+            return `${contextKeyToProperty(key)}: ${value};`;
         })
             .join('');
         dynamicRouteStrings.push(contextKeyToType(dynamicRouteTemplate
@@ -146,6 +146,9 @@ function groupRouteNodes(routeNode, groupedContextKeys = {
     }
     return groupedContextKeys;
 }
+function contextKeyToProperty(contextKey) {
+    return !/^(?!\d)[\w$]+$/.test(contextKey) ? JSON.stringify(contextKey) : contextKey;
+}
 function contextKeyToType(contextKey, partialTypedGroups) {
     if (contextKey.match(GROUP) === null) {
         return `\`${contextKey}\``;

package/build/typed-routes/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/typed-routes/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import { RouteNode } from '../Route';\nimport { getRoutes } from '../getRoutes';\nimport { removeSupportedExtensions } from '../matchers';\nimport { RequireContext } from '../types';\n\n// /[...param1]/ - Match [...param1]\nconst CATCH_ALL = /\\[\\.\\.\\..+?\\]/g;\n// /[param1] - Match [param1]\nconst SLUG = /\\[.+?\\]/g;\n// /(group)/path/(group2)/route - Match [(group), (group2)]\nconst GROUP = /(?:^|\\/)\\(.*?\\)/g;\n\nconst urlParams = \"${`?${string}` | `#${string}` | ''}\";\n\nexport type GetTypedRoutesDeclarationFileOptions = {\n  partialTypedGroups?: boolean;\n  testIgnoreComments?: boolean;\n};\n\nexport function getTypedRoutesDeclarationFile(\n  ctx: RequireContext,\n  {\n    partialTypedGroups = false,\n    testIgnoreComments = false,\n  }: GetTypedRoutesDeclarationFileOptions = {}\n) {\n  let routeNode: RouteNode | null = null;\n\n  try {\n    routeNode = getRoutes(ctx, {\n      ignore: [/_layout\\.[tj]sx?$/], // Skip layout files\n      platformRoutes: false, // We don't need to generate platform specific routes\n      notFound: false, // We don't need +not-found routes either\n      ignoreEntryPoints: true,\n      ignoreRequireErrors: true,\n      importMode: 'async', // Don't load the file\n    });\n  } catch {\n    // Ignore errors from `getRoutes`. This is also called inside the app, which has\n    // a nicer UX for showing error messages\n  }\n\n  const groupedNodes = groupRouteNodes(routeNode);\n  const staticRoutesStrings: string[] = ['Router.RelativePathString', 'Router.ExternalPathString'];\n  const staticRouteInputObjects: string[] = [\n    '{ pathname: Router.RelativePathString, params?: Router.UnknownInputParams }',\n    '{ pathname: Router.ExternalPathString, params?: Router.UnknownInputParams }',\n  ];\n  const staticRouteOutputObjects: string[] = [\n    '{ pathname: Router.RelativePathString, params?: Router.UnknownOutputParams }',\n    '{ pathname: Router.ExternalPathString, params?: Router.UnknownOutputParams }',\n  ];\n\n  for (const type of groupedNodes.static) {\n    staticRoutesStrings.push(contextKeyToType(type + urlParams, partialTypedGroups));\n    staticRouteInputObjects.push(\n      `{ pathname: ${contextKeyToType(type, partialTypedGroups)}; params?: Router.UnknownInputParams; }`\n    );\n    staticRouteOutputObjects.push(\n      `{ pathname: ${contextKeyToType(type, partialTypedGroups)}; params?: Router.UnknownOutputParams; }`\n    );\n  }\n\n  const dynamicRouteStrings: string[] = [];\n  const dynamicRouteInputObjects: string[] = [];\n  const dynamicRouteOutputObjects: string[] = [];\n\n  for (const [dynamicRouteTemplate, paramsNames] of groupedNodes.dynamic) {\n    const inputParams = paramsNames\n      .map((param) => {\n        const key = param.startsWith('...') ? param.slice(3) : param;\n        const value = param.startsWith('...') ? '(string | number)[]' : 'string | number';\n        return `${key}: ${value};`;\n      })\n      .join('');\n\n    const outputParams = paramsNames\n      .map((param) => {\n        const key = param.startsWith('...') ? param.slice(3) : param;\n        const value = param.startsWith('...') ? 'string[]' : 'string';\n        return `${key}: ${value};`;\n      })\n      .join('');\n\n    dynamicRouteStrings.push(\n      contextKeyToType(\n        dynamicRouteTemplate\n          .replaceAll(CATCH_ALL, '${string}')\n          .replaceAll(SLUG, '${Router.SingleRoutePart<T>}'),\n        partialTypedGroups\n      )\n    );\n\n    dynamicRouteInputObjects.push(\n      `{ pathname: ${contextKeyToType(dynamicRouteTemplate, partialTypedGroups)}, params: Router.UnknownInputParams & { ${inputParams} } }`\n    );\n    dynamicRouteOutputObjects.push(\n      `{ pathname: ${contextKeyToType(dynamicRouteTemplate, partialTypedGroups)}, params: Router.UnknownOutputParams & { ${outputParams} } }`\n    );\n  }\n\n  const href = [\n    ...staticRoutesStrings,\n    ...staticRouteInputObjects,\n    ...dynamicRouteStrings,\n    ...dynamicRouteInputObjects,\n  ].join(' | ');\n\n  const hrefInputParams = [...staticRouteInputObjects, ...dynamicRouteInputObjects].join(' | ');\n  const hrefOutputParams = [...staticRouteOutputObjects, ...dynamicRouteOutputObjects].join(' | ');\n\n  const tsExpectError = testIgnoreComments\n    ? '// @ts-ignore-error -- During tests we need to ignore the \"duplicate\" declaration error, as multiple fixture declare types \\n      '\n    : '';\n\n  return `/* eslint-disable */\nimport * as Router from 'expo-router';\n\nexport * from 'expo-router';\n\ndeclare module 'expo-router' {\n  export namespace ExpoRouter {\n    export interface __routes<T extends string | object = string> {\n      ${tsExpectError}hrefInputParams: ${hrefInputParams};\n      ${tsExpectError}hrefOutputParams: ${hrefOutputParams};\n      ${tsExpectError}href: ${href};\n    }\n  }\n}\n`;\n}\n\nfunction groupRouteNodes(\n  routeNode: RouteNode | null,\n  groupedContextKeys = {\n    static: new Set<string>(),\n    dynamic: new Map<string, string[]>(),\n  }\n) {\n  if (!routeNode) {\n    return groupedContextKeys;\n  }\n\n  // Skip non-route files\n  if (routeNode.type !== 'route') {\n    // Except the root layout\n    if (routeNode.route === '') {\n      for (const child of routeNode.children) {\n        groupRouteNodes(child, groupedContextKeys);\n      }\n      return groupedContextKeys;\n    }\n\n    return groupedContextKeys;\n  }\n\n  let routeKey: string;\n\n  if (routeNode.generated) {\n    // Some routes like the root _layout, _sitemap, +not-found are generated.\n    // We cannot use the contextKey, as their context key does not specify a route\n    routeKey = routeNode.route;\n  } else {\n    routeKey = removeSupportedExtensions(routeNode.contextKey)\n      .replace(/\\/index$/, '') // Remove any trailing /index\n      .replace(/^\\./, ''); // Remove any leading .\n  }\n\n  routeKey ||= '/'; // A routeKey may be empty for contextKey '' or './index.js'\n\n  if (!routeKey.startsWith('/')) {\n    // Not all generated files will have the `/` prefix\n    routeKey = `/${routeKey}`;\n  }\n\n  routeKey = routeKey.replace(/\\\\/g, '/');\n\n  if (routeNode.dynamic) {\n    groupedContextKeys.dynamic.set(\n      routeKey,\n      routeKey\n        .split('/')\n        .filter((segment) => {\n          return segment.startsWith('[') && segment.endsWith(']');\n        })\n        .map((segment) => {\n          return segment.slice(1, -1);\n        })\n    );\n  } else {\n    groupedContextKeys.static.add(routeKey);\n  }\n\n  for (const child of routeNode.children) {\n    groupRouteNodes(child, groupedContextKeys);\n  }\n\n  return groupedContextKeys;\n}\n\nfunction contextKeyToType(contextKey: string, partialTypedGroups: boolean) {\n  if (contextKey.match(GROUP) === null) {\n    return `\\`${contextKey}\\``;\n  }\n\n  // If the route has groups, turn them into template strings\n  const typeWithGroups = contextKey.replaceAll(GROUP, (match) => {\n    const groups = match.slice(2, -1); // Remove the leading ( and the trailing )\n    // When `partialRoutes` is enabled, we always change a group to a template\n    if (groups.length > 1 || partialTypedGroups) {\n      // Ensure each group has the trailing slash\n      const groupsAsType = groups.split(',').map((group) => `'/(${group})'`);\n      // `partialRoutes` allow you to skip a group\n      if (partialTypedGroups) {\n        groupsAsType.push(\"''\");\n      }\n      // Combine together into a union\n      return `\\${${groupsAsType.join(' | ')}}`;\n    } else {\n      return match;\n    }\n  });\n\n  let typeWithoutGroups = contextKey.replaceAll(GROUP, '') || '/';\n\n  /**\n   * When getting the static routes, they include a urlParams string at the end.\n   * If we have a route like `/(group)/(group2)`, this would normally be collapsed to `/`.\n   * But because of the urlParams, it becomes `${urlParams}` and we need to add a `/` to the start.\n   */\n  if (typeWithoutGroups.startsWith(urlParams)) {\n    typeWithoutGroups = `/${typeWithoutGroups}`;\n  }\n\n  return `\\`${typeWithGroups}\\` | \\`${typeWithoutGroups}\\``;\n}\n"]}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/typed-routes/generate.ts"],"names":[],"mappings":"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","sourcesContent":["import { RouteNode } from '../Route';\nimport { getRoutes } from '../getRoutes';\nimport { removeSupportedExtensions } from '../matchers';\nimport { RequireContext } from '../types';\n\n// /[...param1]/ - Match [...param1]\nconst CATCH_ALL = /\\[\\.\\.\\..+?\\]/g;\n// /[param1] - Match [param1]\nconst SLUG = /\\[.+?\\]/g;\n// /(group)/path/(group2)/route - Match [(group), (group2)]\nconst GROUP = /(?:^|\\/)\\(.*?\\)/g;\n\nconst urlParams = \"${`?${string}` | `#${string}` | ''}\";\n\nexport type GetTypedRoutesDeclarationFileOptions = {\n  partialTypedGroups?: boolean;\n  testIgnoreComments?: boolean;\n};\n\nexport function getTypedRoutesDeclarationFile(\n  ctx: RequireContext,\n  {\n    partialTypedGroups = false,\n    testIgnoreComments = false,\n  }: GetTypedRoutesDeclarationFileOptions = {}\n) {\n  let routeNode: RouteNode | null = null;\n\n  try {\n    routeNode = getRoutes(ctx, {\n      ignore: [/_layout\\.[tj]sx?$/], // Skip layout files\n      platformRoutes: false, // We don't need to generate platform specific routes\n      notFound: false, // We don't need +not-found routes either\n      ignoreEntryPoints: true,\n      ignoreRequireErrors: true,\n      importMode: 'async', // Don't load the file\n    });\n  } catch {\n    // Ignore errors from `getRoutes`. This is also called inside the app, which has\n    // a nicer UX for showing error messages\n  }\n\n  const groupedNodes = groupRouteNodes(routeNode);\n  const staticRoutesStrings: string[] = ['Router.RelativePathString', 'Router.ExternalPathString'];\n  const staticRouteInputObjects: string[] = [\n    '{ pathname: Router.RelativePathString, params?: Router.UnknownInputParams }',\n    '{ pathname: Router.ExternalPathString, params?: Router.UnknownInputParams }',\n  ];\n  const staticRouteOutputObjects: string[] = [\n    '{ pathname: Router.RelativePathString, params?: Router.UnknownOutputParams }',\n    '{ pathname: Router.ExternalPathString, params?: Router.UnknownOutputParams }',\n  ];\n\n  for (const type of groupedNodes.static) {\n    staticRoutesStrings.push(contextKeyToType(type + urlParams, partialTypedGroups));\n    staticRouteInputObjects.push(\n      `{ pathname: ${contextKeyToType(type, partialTypedGroups)}; params?: Router.UnknownInputParams; }`\n    );\n    staticRouteOutputObjects.push(\n      `{ pathname: ${contextKeyToType(type, partialTypedGroups)}; params?: Router.UnknownOutputParams; }`\n    );\n  }\n\n  const dynamicRouteStrings: string[] = [];\n  const dynamicRouteInputObjects: string[] = [];\n  const dynamicRouteOutputObjects: string[] = [];\n\n  for (const [dynamicRouteTemplate, paramsNames] of groupedNodes.dynamic) {\n    const inputParams = paramsNames\n      .map((param) => {\n        const key = param.startsWith('...') ? param.slice(3) : param;\n        const value = param.startsWith('...') ? '(string | number)[]' : 'string | number';\n        return `${contextKeyToProperty(key)}: ${value};`;\n      })\n      .join('');\n\n    const outputParams = paramsNames\n      .map((param) => {\n        const key = param.startsWith('...') ? param.slice(3) : param;\n        const value = param.startsWith('...') ? 'string[]' : 'string';\n        return `${contextKeyToProperty(key)}: ${value};`;\n      })\n      .join('');\n\n    dynamicRouteStrings.push(\n      contextKeyToType(\n        dynamicRouteTemplate\n          .replaceAll(CATCH_ALL, '${string}')\n          .replaceAll(SLUG, '${Router.SingleRoutePart<T>}'),\n        partialTypedGroups\n      )\n    );\n\n    dynamicRouteInputObjects.push(\n      `{ pathname: ${contextKeyToType(dynamicRouteTemplate, partialTypedGroups)}, params: Router.UnknownInputParams & { ${inputParams} } }`\n    );\n    dynamicRouteOutputObjects.push(\n      `{ pathname: ${contextKeyToType(dynamicRouteTemplate, partialTypedGroups)}, params: Router.UnknownOutputParams & { ${outputParams} } }`\n    );\n  }\n\n  const href = [\n    ...staticRoutesStrings,\n    ...staticRouteInputObjects,\n    ...dynamicRouteStrings,\n    ...dynamicRouteInputObjects,\n  ].join(' | ');\n\n  const hrefInputParams = [...staticRouteInputObjects, ...dynamicRouteInputObjects].join(' | ');\n  const hrefOutputParams = [...staticRouteOutputObjects, ...dynamicRouteOutputObjects].join(' | ');\n\n  const tsExpectError = testIgnoreComments\n    ? '// @ts-ignore-error -- During tests we need to ignore the \"duplicate\" declaration error, as multiple fixture declare types \\n      '\n    : '';\n\n  return `/* eslint-disable */\nimport * as Router from 'expo-router';\n\nexport * from 'expo-router';\n\ndeclare module 'expo-router' {\n  export namespace ExpoRouter {\n    export interface __routes<T extends string | object = string> {\n      ${tsExpectError}hrefInputParams: ${hrefInputParams};\n      ${tsExpectError}hrefOutputParams: ${hrefOutputParams};\n      ${tsExpectError}href: ${href};\n    }\n  }\n}\n`;\n}\n\nfunction groupRouteNodes(\n  routeNode: RouteNode | null,\n  groupedContextKeys = {\n    static: new Set<string>(),\n    dynamic: new Map<string, string[]>(),\n  }\n) {\n  if (!routeNode) {\n    return groupedContextKeys;\n  }\n\n  // Skip non-route files\n  if (routeNode.type !== 'route') {\n    // Except the root layout\n    if (routeNode.route === '') {\n      for (const child of routeNode.children) {\n        groupRouteNodes(child, groupedContextKeys);\n      }\n      return groupedContextKeys;\n    }\n\n    return groupedContextKeys;\n  }\n\n  let routeKey: string;\n\n  if (routeNode.generated) {\n    // Some routes like the root _layout, _sitemap, +not-found are generated.\n    // We cannot use the contextKey, as their context key does not specify a route\n    routeKey = routeNode.route;\n  } else {\n    routeKey = removeSupportedExtensions(routeNode.contextKey)\n      .replace(/\\/index$/, '') // Remove any trailing /index\n      .replace(/^\\./, ''); // Remove any leading .\n  }\n\n  routeKey ||= '/'; // A routeKey may be empty for contextKey '' or './index.js'\n\n  if (!routeKey.startsWith('/')) {\n    // Not all generated files will have the `/` prefix\n    routeKey = `/${routeKey}`;\n  }\n\n  routeKey = routeKey.replace(/\\\\/g, '/');\n\n  if (routeNode.dynamic) {\n    groupedContextKeys.dynamic.set(\n      routeKey,\n      routeKey\n        .split('/')\n        .filter((segment) => {\n          return segment.startsWith('[') && segment.endsWith(']');\n        })\n        .map((segment) => {\n          return segment.slice(1, -1);\n        })\n    );\n  } else {\n    groupedContextKeys.static.add(routeKey);\n  }\n\n  for (const child of routeNode.children) {\n    groupRouteNodes(child, groupedContextKeys);\n  }\n\n  return groupedContextKeys;\n}\n\nfunction contextKeyToProperty(contextKey: string) {\n  return !/^(?!\\d)[\\w$]+$/.test(contextKey) ? JSON.stringify(contextKey) : contextKey;\n}\n\nfunction contextKeyToType(contextKey: string, partialTypedGroups: boolean) {\n  if (contextKey.match(GROUP) === null) {\n    return `\\`${contextKey}\\``;\n  }\n\n  // If the route has groups, turn them into template strings\n  const typeWithGroups = contextKey.replaceAll(GROUP, (match) => {\n    const groups = match.slice(2, -1); // Remove the leading ( and the trailing )\n    // When `partialRoutes` is enabled, we always change a group to a template\n    if (groups.length > 1 || partialTypedGroups) {\n      // Ensure each group has the trailing slash\n      const groupsAsType = groups.split(',').map((group) => `'/(${group})'`);\n      // `partialRoutes` allow you to skip a group\n      if (partialTypedGroups) {\n        groupsAsType.push(\"''\");\n      }\n      // Combine together into a union\n      return `\\${${groupsAsType.join(' | ')}}`;\n    } else {\n      return match;\n    }\n  });\n\n  let typeWithoutGroups = contextKey.replaceAll(GROUP, '') || '/';\n\n  /**\n   * When getting the static routes, they include a urlParams string at the end.\n   * If we have a route like `/(group)/(group2)`, this would normally be collapsed to `/`.\n   * But because of the urlParams, it becomes `${urlParams}` and we need to add a `/` to the start.\n   */\n  if (typeWithoutGroups.startsWith(urlParams)) {\n    typeWithoutGroups = `/${typeWithoutGroups}`;\n  }\n\n  return `\\`${typeWithGroups}\\` | \\`${typeWithoutGroups}\\``;\n}\n"]}

package/build/typed-routes/types.d.ts

@@ -49,7 +49,10 @@ export type RouteInputParams<T extends Route> = Extract<Href, {
 }>['params'];
 export type RouteOutputParams<T extends Route> = Extract<HrefOutputParams, {
     pathname: T;
-}> extends never ? HrefOutputParams extends infer H ? H extends Record<'pathname' | 'params', any> ? T extends H['pathname'] ? H['params'] : never : never : never : Extract<HrefOutputParams, {
+}> extends never ? HrefOutputParams extends infer H ? H extends {
+    pathname: any;
+    params?: any;
+} ? T extends H['pathname'] ? H['params'] : never : never : never : Extract<HrefOutputParams, {
     pathname: T;
 }>['params'];
 export type RouteParams<T extends Route> = RouteOutputParams<T>;

package/build/typed-routes/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/typed-routes/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/typed-routes/types.ts"],"names":[],"mappings":"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"}

package/build/typed-routes/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/typed-routes/types.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * The main routing type for Expo Router.\n *\n * @internal\n * @hidden\n */\nexport namespace ExpoRouter {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-object-type\n  export interface __routes {}\n}\n\nexport type RelativePathString = `./${string}` | `../${string}` | '..';\nexport type SearchOrHash = `?${string}` | `#${string}`;\nexport type ExternalPathString = `${string}:${string}` | `//${string}`;\nexport type Route = Exclude<\n  Extract<Href, object>['pathname'], // Use the HrefObject, as it doesn't have query params\n  RelativePathString | ExternalPathString\n>;\n\n/**\n * The main routing type for Expo Router. It includes all available routes with strongly\n * typed parameters. It can either be:\n * - **string**: A full path like `/profile/settings` or a relative path like `../settings`.\n * - **object**: An object with a `pathname` and optional `params`. The `pathname` can be\n * a full path like `/profile/settings` or a relative path like `../settings`.\n * The params can be an object of key-value pairs.\n *\n * A Href can either be a string or an object.\n */\nexport type Href = ExpoRouter.__routes extends { href: any }\n  ? ExpoRouter.__routes['href']\n  : string | { pathname: string; params?: UnknownInputParams };\n\nexport type HrefInputParams = ExpoRouter.__routes extends { hrefInputParams: any }\n  ? ExpoRouter.__routes['hrefInputParams']\n  : { pathname: string; params?: UnknownInputParams };\n\nexport type HrefOutputParams = ExpoRouter.__routes extends { hrefOutputParams: any }\n  ? ExpoRouter.__routes['hrefOutputParams']\n  : { pathname: string; params?: UnknownOutputParams };\n\nexport type RouteInputParams<T extends Route> =\n  Extract<Href, { pathname: T }> extends never\n    ? HrefInputParams extends infer H\n      ? H extends Record<'pathname' | 'params', any>\n        ? T extends H['pathname']\n          ? H['params']\n          : never\n        : never\n      : never\n    : Extract<HrefInputParams, { pathname: T }>['params'];\n\nexport type RouteOutputParams<T extends Route> =\n  Extract<HrefOutputParams, { pathname: T }> extends never\n    ? HrefOutputParams extends infer H\n      ? H extends Record<'pathname' | 'params', any>\n        ? T extends H['pathname']\n          ? H['params']\n          : never\n        : never\n      : never\n    : Extract<HrefOutputParams, { pathname: T }>['params'];\n\nexport type RouteParams<T extends Route> = RouteOutputParams<T>;\n\n/**\n * Routes can have known inputs (e.g query params).\n * Unlike outputs, inputs can be `undefined` or `null`.\n *\n * @hidden\n */\nexport type UnknownInputParams = Record<\n  string,\n  string | number | undefined | null | (string | number)[]\n>;\n\n/**\n * Routes can have unknown outputs (e.g query params).\n * Unlike inputs, outputs can't be undefined or null.\n *\n * @hidden\n */\nexport type UnknownOutputParams = Record<string, string | string[]>;\n\n/**\n * Return only the RoutePart of a string. If the string has multiple parts return never\n *\n * string   | type\n *| ---------|------|\n *| 123      | 123 |\n *| /123/abc | never |\n *| 123?abc  | never |\n *| ./123    | never |\n *| /123     | never |\n *| 123/../  | never |\n *\n * @hidden\n */\nexport type SingleRoutePart<S extends string | object> = S extends object\n  ? never\n  : S extends `${string}/${string}`\n    ? never\n    : S extends `${string}${SearchOrHash}`\n      ? never\n      : S extends ''\n        ? never\n        : S extends `(${string})`\n          ? never\n          : S extends `[${string}]`\n            ? never\n            : S;\n\n/**\n * @deprecated Use `RouteParams` or `StrictRouteParams` instead.\n *\n * @hidden\n */\nexport type SearchParams<T extends string = never> = RouteParams<T>;\n\n/**\n * @hidden\n */\nexport type RouteSegments<HrefOrSegments extends Route | string[]> = HrefOrSegments extends string[]\n  ? HrefOrSegments\n  : HrefOrSegments extends `.${string}`\n    ? never\n    : HrefOrSegments extends ``\n      ? never\n      : HrefOrSegments extends `/${infer PartA}`\n        ? RouteSegments<PartA>\n        : HrefOrSegments extends `${infer PartA}?${string}`\n          ? RouteSegments<PartA>\n          : HrefOrSegments extends `${infer PartA}#${string}`\n            ? RouteSegments<PartA>\n            : HrefOrSegments extends `${infer PartA}/${infer PartB}`\n              ? [PartA, ...RouteSegments<PartB>]\n              : [HrefOrSegments];\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/typed-routes/types.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * The main routing type for Expo Router.\n *\n * @internal\n * @hidden\n */\nexport namespace ExpoRouter {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-object-type\n  export interface __routes {}\n}\n\nexport type RelativePathString = `./${string}` | `../${string}` | '..';\nexport type SearchOrHash = `?${string}` | `#${string}`;\nexport type ExternalPathString = `${string}:${string}` | `//${string}`;\nexport type Route = Exclude<\n  Extract<Href, object>['pathname'], // Use the HrefObject, as it doesn't have query params\n  RelativePathString | ExternalPathString\n>;\n\n/**\n * The main routing type for Expo Router. It includes all available routes with strongly\n * typed parameters. It can either be:\n * - **string**: A full path like `/profile/settings` or a relative path like `../settings`.\n * - **object**: An object with a `pathname` and optional `params`. The `pathname` can be\n * a full path like `/profile/settings` or a relative path like `../settings`.\n * The params can be an object of key-value pairs.\n *\n * A Href can either be a string or an object.\n */\nexport type Href = ExpoRouter.__routes extends { href: any }\n  ? ExpoRouter.__routes['href']\n  : string | { pathname: string; params?: UnknownInputParams };\n\nexport type HrefInputParams = ExpoRouter.__routes extends { hrefInputParams: any }\n  ? ExpoRouter.__routes['hrefInputParams']\n  : { pathname: string; params?: UnknownInputParams };\n\nexport type HrefOutputParams = ExpoRouter.__routes extends { hrefOutputParams: any }\n  ? ExpoRouter.__routes['hrefOutputParams']\n  : { pathname: string; params?: UnknownOutputParams };\n\nexport type RouteInputParams<T extends Route> =\n  Extract<Href, { pathname: T }> extends never\n    ? HrefInputParams extends infer H\n      ? H extends Record<'pathname' | 'params', any>\n        ? T extends H['pathname']\n          ? H['params']\n          : never\n        : never\n      : never\n    : Extract<HrefInputParams, { pathname: T }>['params'];\n\nexport type RouteOutputParams<T extends Route> =\n  Extract<HrefOutputParams, { pathname: T }> extends never\n    ? HrefOutputParams extends infer H\n      ? H extends { pathname: any; params?: any }\n        ? T extends H['pathname']\n          ? H['params']\n          : never\n        : never\n      : never\n    : Extract<HrefOutputParams, { pathname: T }>['params'];\n\nexport type RouteParams<T extends Route> = RouteOutputParams<T>;\n\n/**\n * Routes can have known inputs (e.g query params).\n * Unlike outputs, inputs can be `undefined` or `null`.\n *\n * @hidden\n */\nexport type UnknownInputParams = Record<\n  string,\n  string | number | undefined | null | (string | number)[]\n>;\n\n/**\n * Routes can have unknown outputs (e.g query params).\n * Unlike inputs, outputs can't be undefined or null.\n *\n * @hidden\n */\nexport type UnknownOutputParams = Record<string, string | string[]>;\n\n/**\n * Return only the RoutePart of a string. If the string has multiple parts return never\n *\n * string   | type\n *| ---------|------|\n *| 123      | 123 |\n *| /123/abc | never |\n *| 123?abc  | never |\n *| ./123    | never |\n *| /123     | never |\n *| 123/../  | never |\n *\n * @hidden\n */\nexport type SingleRoutePart<S extends string | object> = S extends object\n  ? never\n  : S extends `${string}/${string}`\n    ? never\n    : S extends `${string}${SearchOrHash}`\n      ? never\n      : S extends ''\n        ? never\n        : S extends `(${string})`\n          ? never\n          : S extends `[${string}]`\n            ? never\n            : S;\n\n/**\n * @deprecated Use `RouteParams` or `StrictRouteParams` instead.\n *\n * @hidden\n */\nexport type SearchParams<T extends string = never> = RouteParams<T>;\n\n/**\n * @hidden\n */\nexport type RouteSegments<HrefOrSegments extends Route | string[]> = HrefOrSegments extends string[]\n  ? HrefOrSegments\n  : HrefOrSegments extends `.${string}`\n    ? never\n    : HrefOrSegments extends ``\n      ? never\n      : HrefOrSegments extends `/${infer PartA}`\n        ? RouteSegments<PartA>\n        : HrefOrSegments extends `${infer PartA}?${string}`\n          ? RouteSegments<PartA>\n          : HrefOrSegments extends `${infer PartA}#${string}`\n            ? RouteSegments<PartA>\n            : HrefOrSegments extends `${infer PartA}/${infer PartB}`\n              ? [PartA, ...RouteSegments<PartB>]\n              : [HrefOrSegments];\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "4.0.21",
+  "version": "4.0.22",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "author": "650 Industries, Inc.",
   "license": "MIT",
@@ -117,5 +117,5 @@
     "semver": "~7.6.3",
     "server-only": "^0.0.1"
   },
-  "gitHead": "5b966b32f0a49827bd0976e8f6c1ba2fb9139d4a"
+  "gitHead": "bffc6ac6def0a8286008b4fa69b2d94245d298d1"
 }

package/build/onboard/createEntryFile.d.ts

@@ -1,4 +0,0 @@
-/** Middleware for creating an entry file in the project. */
-export declare function createEntryFileAsync(): Promise<Response> | undefined;
-export declare function getAbsolutePath(): string;
-//# sourceMappingURL=createEntryFile.d.ts.map

package/build/onboard/createEntryFile.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createEntryFile.d.ts","sourceRoot":"","sources":["../../src/onboard/createEntryFile.ts"],"names":[],"mappings":"AAEA,4DAA4D;AAC5D,wBAAgB,oBAAoB,kCAkBnC;AAED,wBAAgB,eAAe,WAE9B"}