@absolutejs/absolute 0.20.0-beta.46 → 0.20.0-beta.47

package/dist/mobile/index.js

@@ -167,7 +167,7 @@ var init_startupBanner = __esm(() => {
 
 // src/mobile/config.ts
 import { resolve as resolve6 } from "path";
-var APP_ID_PATTERN, SCHEME_PATTERN, APPLE_APP_ID_PREFIX_PATTERN, CERTIFICATE_FINGERPRINT_PATTERN, HOSTNAME_PATTERN, resolveProjectPath = (projectRoot, value, field2) => {
+var APP_ID_PATTERN, SCHEME_PATTERN, APPLE_APP_ID_PREFIX_PATTERN, CERTIFICATE_FINGERPRINT_PATTERN, HOSTNAME_PATTERN, EXPO_RESERVED_ROUTE_PREFIXES, resolveProjectPath = (projectRoot, value, field2) => {
   const root = resolve6(projectRoot);
   const path = resolve6(root, value);
   if (path !== root && !path.startsWith(`${root}/`)) {
@@ -240,11 +240,31 @@ var APP_ID_PATTERN, SCHEME_PATTERN, APPLE_APP_ID_PREFIX_PATTERN, CERTIFICATE_FIN
     }
     return value.match(/.{2}/g)?.join(":") ?? value;
   }))
-].sort(), normalizeExpoNativeRoutes = (config, projectRoot) => {
+].sort(), validateExpoNativeRouteSegment = (path, segment, index, count, parameters) => {
+  if (segment === "*" && (index !== count - 1 || count === 1)) {
+    throw new TypeError(`mobile.routes.native route ${path} must use * once, as the final segment after a static or parameterized prefix.`);
+  }
+  if (segment === "*")
+    return;
+  if (!segment.startsWith(":") && (segment.includes("*") || segment.includes(":"))) {
+    throw new TypeError(`mobile.routes.native route ${path} contains invalid segment ${segment}.`);
+  }
+  if (!segment.startsWith(":"))
+    return;
+  const name = segment.slice(1);
+  if (!/^[A-Za-z][A-Za-z0-9_]*$/u.test(name)) {
+    throw new TypeError(`mobile.routes.native route ${path} has invalid parameter ${segment}.`);
+  }
+  if (parameters.has(name)) {
+    throw new TypeError(`mobile.routes.native route ${path} repeats parameter ${segment}.`);
+  }
+  parameters.add(name);
+}, normalizeExpoNativeRoutes = (config, projectRoot) => {
   if (config.engine !== "expo")
     return {};
   const routes = config.routes?.native ?? {};
   const normalized = {};
+  const ownership = new Map;
   for (const [route, module] of Object.entries(routes)) {
     const path = normalizeEntry(route);
     if (path.includes("?") || path.includes("#") || path !== "/" && path.endsWith("/")) {
@@ -253,9 +273,18 @@ var APP_ID_PATTERN, SCHEME_PATTERN, APPLE_APP_ID_PREFIX_PATTERN, CERTIFICATE_FIN
     if (path === "/__absolute/native") {
       throw new TypeError("mobile.routes.native reserves /__absolute/native for the Expo diagnostic screen.");
     }
-    if (path.includes("*") || path.includes(":")) {
-      throw new TypeError(`mobile.routes.native route ${path} must be static during the Expo experiment; parameters and wildcards are not supported yet.`);
+    const segments = path.split("/").filter(Boolean);
+    if (segments[0] && EXPO_RESERVED_ROUTE_PREFIXES.has(segments[0])) {
+      throw new TypeError(`mobile.routes.native route ${path} conflicts with an Expo Router or Metro reserved path.`);
+    }
+    const parameters = new Set;
+    segments.forEach((segment, index) => validateExpoNativeRouteSegment(path, segment, index, segments.length, parameters));
+    const signature = segments.map((segment) => segment.startsWith(":") ? ":" : segment).join("/");
+    const existing = ownership.get(signature);
+    if (existing) {
+      throw new TypeError(`mobile.routes.native routes ${existing} and ${path} claim the same Expo route pattern.`);
     }
+    ownership.set(signature, path);
     normalized[path] = resolveProjectPath(projectRoot, requireText(module, `mobile.routes.native[${path}]`), `mobile.routes.native[${path}]`);
   }
   return Object.fromEntries(Object.entries(normalized).sort(([left], [right]) => left.localeCompare(right)));
@@ -294,6 +323,16 @@ var init_config = __esm(() => {
   APPLE_APP_ID_PREFIX_PATTERN = /^[A-Z0-9]{10}$/;
   CERTIFICATE_FINGERPRINT_PATTERN = /^[0-9A-F]{64}$/;
   HOSTNAME_PATTERN = /^(?=.{1,253}$)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)(?:\.(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?))*$/;
+  EXPO_RESERVED_ROUTE_PREFIXES = new Set([
+    "_expo",
+    "_flight",
+    "_sitemap",
+    "assets",
+    "expo-dev-plugins",
+    "inspector",
+    "manifest",
+    "public"
+  ]);
 });
 
 // src/utils/stringModifiers.ts
@@ -6127,7 +6166,7 @@ import {
   writeFile as writeFile12
 } from "fs/promises";
 import { createHash as createHash10 } from "crypto";
-import { basename as basename4, dirname as dirname10, join as join14, relative as relative10, resolve as resolve12 } from "path";
+import { basename as basename4, dirname as dirname10, join as join14, relative as relative10, resolve as resolve12, sep as sep6 } from "path";
 var EXPO_GENERATED_HEADER = `// Generated by AbsoluteJS. Edit absolute.config.ts, then run absolute mobile sync.
 `;
 var EXPO_ASSET_EXTENSION = ".absasset";
@@ -6144,14 +6183,19 @@ var portableRelative2 = (from, destination) => {
   const value = relative10(from, destination).replaceAll("\\", "/");
   return value.startsWith(".") ? value : `./${value}`;
 };
-var routeSegments = (route) => route.split("/").filter(Boolean).map((segment) => {
-  if (segment.startsWith(":"))
-    return `[${segment.slice(1)}]`;
-  if (segment === "." || segment === ".." || !/^[A-Za-z0-9._~-]+$/u.test(segment)) {
-    throw new TypeError(`Expo native route ${route} contains an unsupported segment ${segment}.`);
-  }
-  return segment;
-});
+var routeSegments = (route) => {
+  const segments = route.split("/").filter(Boolean);
+  return segments.map((segment, index) => {
+    if (segment.startsWith(":"))
+      return `[${segment.slice(1)}]`;
+    if (segment === "*" && index === segments.length - 1)
+      return "[...absoluteWildcard]";
+    if (segment === "." || segment === ".." || !/^[A-Za-z0-9._~-]+$/u.test(segment)) {
+      throw new TypeError(`Expo native route ${route} contains an unsupported segment ${segment}.`);
+    }
+    return segment;
+  });
+};
 var routeFile = (project, route) => join14(project, "app", ...routeSegments(route), "index.tsx");
 var packageDependencies = (plan) => Object.fromEntries(plan.requiredPackages.map((spec) => {
   const separator = spec.lastIndexOf("@");
@@ -6629,6 +6673,7 @@ var webHostSource = (config, auth, sync) => {
     "/__absolute/native",
     ...Object.keys(config.expoNativeRoutes)
   ];
+  const nativeRoutePatterns = nativeRoutes.map((route) => route.split("/").filter(Boolean));
   return `${EXPO_GENERATED_HEADER}import * as Linking from 'expo-linking';
 import { router, usePathname } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
@@ -6643,7 +6688,7 @@ ${sync ? "import { createAbsoluteExpoSyncBridge, startAbsoluteExpoSync } from '.
 const BRIDGE_FORMAT = 3;
 const MAX_MESSAGE_BYTES = 64 * 1024;
 const MAX_HTTP_BODY_BYTES = 48 * 1024;
-const NATIVE_ROUTES = new Set(${JSON.stringify(nativeRoutes)});
+const NATIVE_ROUTE_PATTERNS = ${JSON.stringify(nativeRoutePatterns)};
 const PRODUCTION_ORIGIN = ${JSON.stringify(config.productionOrigin)};
 const DEV_ORIGIN = Platform.OS === 'android'
 	? process.env.EXPO_PUBLIC_ABSOLUTE_DEV_ANDROID_ORIGIN
@@ -6652,6 +6697,19 @@ const HMR_TARGET = Platform.OS === 'android' ? 'expo-android' : 'expo-ios';
 const AUTH_ENABLED = ${auth ? "true" : "false"};
 const SYNC_ENABLED = ${sync ? "true" : "false"};
 
+const isNativeRoute = (pathname: string) => {
+	const segments = pathname.split('/').filter(Boolean);
+	return NATIVE_ROUTE_PATTERNS.some(pattern => {
+		for (let index = 0; index < pattern.length; index += 1) {
+			const expected = pattern[index]!;
+			if (expected === '*') return segments.length > index;
+			if (segments[index] === undefined) return false;
+			if (!expected.startsWith(':') && expected !== segments[index]) return false;
+		}
+		return segments.length === pattern.length;
+	});
+};
+
 const bridgeBootstrap = (path: string) => {
 	const initialPath = DEV_ORIGIN
 		? 'location.pathname + location.search + location.hash'
@@ -6727,7 +6785,7 @@ const bridgeBootstrap = (path: string) => {
 		const anchor = event.target instanceof Element ? event.target.closest('a[href]') : null;
 		if (!anchor) return;
 		const url = new URL(anchor.href, location.href);
-		if (!${JSON.stringify(nativeRoutes)}.includes(url.pathname)) return;
+		if (!isNativeRoute(url.pathname)) return;
 		event.preventDefault();
 		send({ format: 3, kind: 'event', event: 'navigation', path: url.pathname + url.search + url.hash });
 	}, true);
@@ -6850,7 +6908,7 @@ export function AbsoluteWebHost() {
 		if (message.kind === 'event' && (message.event === 'navigation' || message.event === 'ready')) {
 			const target = new URL(message.path, PRODUCTION_ORIGIN);
 			if (target.origin !== PRODUCTION_ORIGIN) return;
-			if (NATIVE_ROUTES.has(target.pathname)) router.push(message.path as never);
+			if (isNativeRoute(target.pathname)) router.push(message.path as never);
 			else activeWebPath.current = message.path;
 			return;
 		}
@@ -6968,6 +7026,18 @@ var writeManagedFile = async (path, source, force) => {
   await rename11(temporary, path);
   return true;
 };
+var pruneStaleManagedExpoRoutes = async (project, expected) => {
+  const appDirectory = join14(project, "app");
+  if (!await exists3(appDirectory))
+    return 0;
+  const files = await walkFiles(appDirectory);
+  const stale = (await Promise.all(files.map(async (path) => ({
+    managed: path.endsWith(".tsx") && (await readFile14(path, "utf8")).startsWith(EXPO_GENERATED_HEADER),
+    path
+  })))).filter(({ managed, path }) => managed && !expected.has(path));
+  await Promise.all(stale.map(({ path }) => rm9(path, { force: true })));
+  return stale.length;
+};
 var jsonSource = (value) => `${JSON.stringify(value, null, "\t")}
 `;
 var emptyWebAssetsSource = `${EXPO_GENERATED_HEADER}export const materializeAbsoluteWebBundle = async () => {
@@ -7066,8 +7136,9 @@ node_modules/
     const wrapper = route === "/" ? join14(project, "app", "index.tsx") : routeFile(project, route);
     files.set(wrapper, nativeWrapperSource(wrapper, module));
   }
+  const removed = await pruneStaleManagedExpoRoutes(project, new Set([...files.keys()].filter((path) => path.startsWith(`${join14(project, "app")}${sep6}`))));
   const changes = await Promise.all([...files].map(([path, source]) => writeManagedFile(path, source, true)));
-  const changed = changes.filter(Boolean).length;
+  const changed = removed + changes.filter(Boolean).length;
   return { changed, path: project, written: [...files.keys()] };
 };
 var walkFiles = async (root, directory = root) => {
@@ -7987,7 +8058,7 @@ init_config();
 // src/mobile/ciWorkflow.ts
 import { existsSync as existsSync4 } from "fs";
 import { access as access11, mkdir as mkdir12, readFile as readFile16, writeFile as writeFile13 } from "fs/promises";
-import { dirname as dirname11, extname as extname4, relative as relative11, resolve as resolve14, sep as sep6 } from "path";
+import { dirname as dirname11, extname as extname4, relative as relative11, resolve as resolve14, sep as sep7 } from "path";
 var ABSOLUTE_MOBILE_CI_WORKFLOW_FORMAT = 1;
 var SECRET_NAME_PATTERN = /^[A-Z][A-Z0-9_]*$/u;
 var CI_ENV_INDENTATION = 6;
@@ -8019,7 +8090,7 @@ var projectPath = (projectRoot, value, field2, options = {}) => {
   const root = resolve14(projectRoot);
   const path = resolve14(root, value);
   const portable = relative11(root, path).replaceAll("\\", "/");
-  if (portable === ".." || portable.startsWith(`..${sep6}`) || portable.startsWith("../") || portable === "") {
+  if (portable === ".." || portable.startsWith(`..${sep7}`) || portable.startsWith("../") || portable === "") {
     throw new TypeError(`${field2} must remain inside the project root.`);
   }
   if (/\r|\n/u.test(portable) || portable.startsWith("-"))
@@ -8033,7 +8104,7 @@ var workflowOutputPath = (projectRoot, value) => {
   const workflows = resolve14(root, ".github/workflows");
   const path = resolve14(root, value ?? ".github/workflows/absolute-mobile.yml");
   const portable = relative11(workflows, path);
-  if (portable === ".." || portable.startsWith(`..${sep6}`) || extname4(path) !== ".yml" && extname4(path) !== ".yaml") {
+  if (portable === ".." || portable.startsWith(`..${sep7}`) || extname4(path) !== ".yml" && extname4(path) !== ".yaml") {
     throw new TypeError("mobile ci github --output must be a .yml or .yaml file inside .github/workflows.");
   }
   return path;
@@ -9212,7 +9283,7 @@ init_nativeAuth();
 
 // src/mobile/releasePublisher.ts
 import { access as access12 } from "fs/promises";
-import { isAbsolute as isAbsolute6, relative as relative12, resolve as resolve15, sep as sep7 } from "path";
+import { isAbsolute as isAbsolute6, relative as relative12, resolve as resolve15, sep as sep8 } from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
 var prepareAbsoluteIosRelease = async (publisher, options) => {
   if (typeof publisher.prepareIosRelease !== "function") {
@@ -9241,7 +9312,7 @@ var publisherModulePath = (projectRoot, requested) => {
   const root = resolve15(projectRoot);
   const path = resolve15(root, requested);
   const projectRelative = relative12(root, path);
-  if (projectRelative === ".." || projectRelative.startsWith(`..${sep7}`) || isAbsolute6(projectRelative)) {
+  if (projectRelative === ".." || projectRelative.startsWith(`..${sep8}`) || isAbsolute6(projectRelative)) {
     throw new TypeError("mobile publish --registry must remain inside the project.");
   }
   return path;
@@ -10201,5 +10272,5 @@ export {
   writeAbsoluteMobileGithubWorkflow
 };
 
-//# debugId=99CCB7E44742D46964756E2164756E21
+//# debugId=CFD74BC8ED7A634C64756E2164756E21
 //# sourceMappingURL=index.js.map