runcloud 0.2.172 → 0.2.173

package/dist/commands/appStoreEvaluate.js

@@ -303,12 +303,10 @@ function evaluateDuplicateRoutes(root, item) {
         return makeItem(item, 'pass', 'No Expo Router app directory found.', 'scan: app/ directory absent');
     const routes = new Map();
     for (const file of walkFiles(appDir)) {
-        if (!/\.(tsx|ts|jsx|js)$/.test(file) || /(^|\/)_layout\.(tsx|ts|jsx|js)$/.test(toRel(root, file)))
+        if (!/\.(tsx|ts|jsx|js)$/.test(file))
             continue;
-        const route = routePath(appDir, file);
-        const current = routes.get(route) ?? [];
-        current.push(toRel(root, file));
-        routes.set(route, current);
+        for (const route of routeKeys(appDir, file))
+            routes.set(route, [...(routes.get(route) ?? []), toRel(root, file)]);
     }
     const duplicates = [...routes.entries()].filter(([, files]) => files.length > 1);
     if (!duplicates.length)
@@ -571,12 +569,15 @@ function routerDir(root) {
     const src = path.join(root, 'src', 'app');
     return safeStat(src)?.isDirectory() ? src : path.join(root, 'app');
 }
-function routePath(appDir, file) {
-    const rel = toRel(appDir, file).replace(/\.(tsx|ts|jsx|js)$/, '');
-    const parts = rel.split('/').filter((part) => part && !/^\(.+\)$/.test(part));
-    if (parts[parts.length - 1] === 'index')
-        parts.pop();
-    return `/${parts.join('/')}`;
+function routeKeys(appDir, file) {
+    let keys = [''];
+    for (const part of toRel(appDir, file).replace(/\.(tsx|ts|jsx|js)$/, '').split('/')) {
+        let options = /^\(.+,.+\)$/.test(part) ? part.slice(1, -1).split(',').map((group) => `(${group})`) : [part];
+        if (keys.length * options.length > 64)
+            options = [part];
+        keys = keys.flatMap((key) => options.map((option) => `${key}/${option}`));
+    }
+    return keys;
 }
 function evidence(matches) {
     return matches.slice(0, 5).map((match) => `${match.file}:${match.line}: ${match.text}`).join('\n');

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.2.172';
+export const CLI_VERSION = '0.2.173';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.2.172",
+  "version": "0.2.173",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [