vinext 0.0.28 → 0.0.30

package/dist/routing/app-router.d.ts

@@ -12,6 +12,8 @@ export interface InterceptingRoute {
 export interface ParallelSlot {
     /** Slot name (e.g. "team" from @team) */
     name: string;
+    /** Absolute path to the @slot directory that owns this slot. Internal routing metadata. */
+    ownerDir: string;
     /** Absolute path to the slot's page component */
     pagePath: string | null;
     /** Absolute path to the slot's default.tsx fallback */

package/dist/routing/app-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-router.d.ts","sourceRoot":"","sources":["../../src/routing/app-router.ts"],"names":[],"mappings":"AAkBA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,iBAAiB;IAChC,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,iDAAiD;IACjD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uDAAuD;IACvD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,wEAAwE;IACxE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,kDAAkD;IAClD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2CAA2C;IAC3C,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,yDAAyD;IACzD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,qDAAqD;IACrD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,mFAAmF;IACnF,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,6BAA6B;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iDAAiD;IACjD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,gBAAgB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACpC,mEAAmE;IACnE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,aAAa,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACjC,qCAAqC;IACrC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,wCAAwC;IACxC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,sCAAsC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kFAAkF;IAClF,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAOD,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,EAClC,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAyDrB;AAmvBD;;GAEG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,QAAQ,EAAE,GACjB;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,CAoBvE"}
+{"version":3,"file":"app-router.d.ts","sourceRoot":"","sources":["../../src/routing/app-router.ts"],"names":[],"mappings":"AAkBA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,iBAAiB;IAChC,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uDAAuD;IACvD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,wEAAwE;IACxE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oDAAoD;IACpD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,kDAAkD;IAClD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2CAA2C;IAC3C,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,yDAAyD;IACzD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,qDAAqD;IACrD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,mFAAmF;IACnF,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,6BAA6B;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iDAAiD;IACjD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,gBAAgB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACpC,mEAAmE;IACnE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,aAAa,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACjC,qCAAqC;IACrC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,wCAAwC;IACxC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,sCAAsC;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kFAAkF;IAClF,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAOD,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,EAClC,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAkDrB;AA40BD;;GAEG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,QAAQ,EAAE,GACjB;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,CASvE"}

package/dist/routing/app-router.js

@@ -15,9 +15,10 @@
  */
 import path from "node:path";
 import fs from "node:fs";
-import { compareRoutes } from "./utils.js";
+import { compareRoutes, decodeRouteSegment, normalizePathnameForRouteMatch } from "./utils.js";
 import { createValidFileMatcher, scanWithExtensions, } from "./file-matcher.js";
 import { validateRoutePatterns } from "./route-validation.js";
+import { buildRouteTrie, trieMatch } from "./route-trie.js";
 // Cache for app routes
 let cachedRoutes = null;
 let cachedAppDir = null;
@@ -38,16 +39,18 @@ export async function appRouter(appDir, pageExtensions, matcher) {
     }
     // Find all page.tsx and route.ts files, excluding @slot directories
     // (slot pages are not standalone routes — they're rendered as props of their parent layout)
+    // and _private folders (Next.js convention for colocated non-route files).
     const routes = [];
+    const excludeDir = (name) => name.startsWith("@") || name.startsWith("_");
     // Process page files in a single pass
     // Use function form of exclude for Node < 22.14 compatibility (string arrays require >= 22.14)
-    for await (const file of scanWithExtensions("**/page", appDir, matcher.extensions, (name) => name.startsWith("@"))) {
+    for await (const file of scanWithExtensions("**/page", appDir, matcher.extensions, excludeDir)) {
         const route = fileToAppRoute(file, appDir, "page", matcher);
         if (route)
             routes.push(route);
     }
     // Process route handler files (API routes) in a single pass
-    for await (const file of scanWithExtensions("**/route", appDir, matcher.extensions, (name) => name.startsWith("@"))) {
+    for await (const file of scanWithExtensions("**/route", appDir, matcher.extensions, excludeDir)) {
         const route = fileToAppRoute(file, appDir, "route", matcher);
         if (route)
             routes.push(route);
@@ -80,7 +83,16 @@ export async function appRouter(appDir, pageExtensions, matcher) {
  */
 function discoverSlotSubRoutes(routes, _appDir, matcher) {
     const syntheticRoutes = [];
-    const existingPatterns = new Set(routes.map((r) => r.pattern));
+    // O(1) lookup for existing routes by pattern — avoids O(n) routes.find() per sub-path per parent.
+    // Updated as new synthetic routes are pushed so that later parents can see earlier synthetic entries.
+    const routesByPattern = new Map(routes.map((r) => [r.pattern, r]));
+    const slotKey = (slotName, ownerDir) => `${slotName}\u0000${ownerDir}`;
+    const applySlotSubPages = (route, slotPages) => {
+        route.parallelSlots = route.parallelSlots.map((slot) => ({
+            ...slot,
+            pagePath: slotPages.get(slotKey(slot.name, slot.ownerDir)) ?? slot.pagePath,
+        }));
+    };
     for (const parentRoute of routes) {
         if (parentRoute.parallelSlots.length === 0)
             continue;
@@ -88,7 +100,8 @@ function discoverSlotSubRoutes(routes, _appDir, matcher) {
             continue;
         const parentPageDir = path.dirname(parentRoute.pagePath);
         // Collect sub-paths from all slots.
-        // Map: relative sub-path (e.g., "demographics") -> Map<slotName, pagePath>
+        // Map: normalized visible sub-path -> slot pages, raw filesystem segments (for routeSegments),
+        // and the pre-computed convertedSubRoute (to avoid a redundant re-conversion in the merge loop).
         const subPathMap = new Map();
         for (const slot of parentRoute.parallelSlots) {
             const slotDir = path.join(parentPageDir, `@${slot.name}`);
@@ -96,37 +109,55 @@ function discoverSlotSubRoutes(routes, _appDir, matcher) {
                 continue;
             const subPages = findSlotSubPages(slotDir, matcher);
             for (const { relativePath, pagePath } of subPages) {
-                if (!subPathMap.has(relativePath)) {
-                    subPathMap.set(relativePath, new Map());
+                const subSegments = relativePath.split(path.sep);
+                const convertedSubRoute = convertSegmentsToRouteParts(subSegments);
+                if (!convertedSubRoute)
+                    continue;
+                const { urlSegments } = convertedSubRoute;
+                const normalizedSubPath = urlSegments.join("/");
+                let subPathEntry = subPathMap.get(normalizedSubPath);
+                if (!subPathEntry) {
+                    subPathEntry = {
+                        rawSegments: subSegments,
+                        converted: convertedSubRoute,
+                        slotPages: new Map(),
+                    };
+                    subPathMap.set(normalizedSubPath, subPathEntry);
+                }
+                const slotId = slotKey(slot.name, slot.ownerDir);
+                const existingSlotPage = subPathEntry.slotPages.get(slotId);
+                if (existingSlotPage) {
+                    const pattern = joinRoutePattern(parentRoute.pattern, normalizedSubPath);
+                    throw new Error(`You cannot have two routes that resolve to the same path ("${pattern}").`);
                 }
-                subPathMap.get(relativePath).set(slot.name, pagePath);
+                subPathEntry.slotPages.set(slotId, pagePath);
             }
         }
         if (subPathMap.size === 0)
             continue;
         // Find the default.tsx for the children slot at the parent directory
         const childrenDefault = findFile(parentPageDir, "default", matcher);
-        for (const [subPath, slotPages] of subPathMap) {
-            // Convert sub-path segments to URL pattern parts
-            const subSegments = subPath.split(path.sep);
-            const convertedSubRoute = convertSegmentsToRouteParts(subSegments);
-            if (!convertedSubRoute)
-                continue;
+        if (!childrenDefault)
+            continue;
+        for (const { rawSegments, converted: convertedSubRoute, slotPages } of subPathMap.values()) {
             const { urlSegments: urlParts, params: subParams, isDynamic: subIsDynamic, } = convertedSubRoute;
             const subUrlPath = urlParts.join("/");
-            const pattern = parentRoute.pattern === "/" ? "/" + subUrlPath : parentRoute.pattern + "/" + subUrlPath;
-            // Skip if this pattern already exists as a regular route
-            if (existingPatterns.has(pattern))
-                continue;
-            if (syntheticRoutes.some((r) => r.pattern === pattern))
+            const pattern = joinRoutePattern(parentRoute.pattern, subUrlPath);
+            const existingRoute = routesByPattern.get(pattern);
+            if (existingRoute) {
+                if (existingRoute.routePath && !existingRoute.pagePath) {
+                    throw new Error(`You cannot have two routes that resolve to the same path ("${pattern}").`);
+                }
+                applySlotSubPages(existingRoute, slotPages);
                 continue;
+            }
             // Build parallel slots for this sub-route: matching slots get the sub-page,
             // non-matching slots get null pagePath (rendering falls back to defaultPath)
             const subSlots = parentRoute.parallelSlots.map((slot) => ({
                 ...slot,
-                pagePath: slotPages.get(slot.name) || null,
+                pagePath: slotPages.get(slotKey(slot.name, slot.ownerDir)) || null,
             }));
-            syntheticRoutes.push({
+            const newRoute = {
                 pattern,
                 pagePath: childrenDefault, // children slot uses parent's default.tsx as page
                 routePath: null,
@@ -140,12 +171,14 @@ function discoverSlotSubRoutes(routes, _appDir, matcher) {
                 notFoundPaths: parentRoute.notFoundPaths,
                 forbiddenPath: parentRoute.forbiddenPath,
                 unauthorizedPath: parentRoute.unauthorizedPath,
-                routeSegments: [...parentRoute.routeSegments, ...subSegments],
+                routeSegments: [...parentRoute.routeSegments, ...rawSegments],
                 layoutTreePositions: parentRoute.layoutTreePositions,
                 isDynamic: parentRoute.isDynamic || subIsDynamic,
                 params: [...parentRoute.params, ...subParams],
                 patternParts: [...parentRoute.patternParts, ...urlParts],
-            });
+            };
+            syntheticRoutes.push(newRoute);
+            routesByPattern.set(pattern, newRoute);
         }
     }
     return syntheticRoutes;
@@ -444,6 +477,7 @@ function discoverParallelSlots(dir, appDir, matcher) {
             continue;
         slots.push({
             name: slotName,
+            ownerDir: slotDir,
             pagePath,
             defaultPath,
             layoutPath: findFile(slotDir, "layout", matcher),
@@ -494,6 +528,9 @@ function scanForInterceptingPages(currentDir, routeDir, appDir, results, matcher
     for (const entry of entries) {
         if (!entry.isDirectory())
             continue;
+        // Skip private folders (prefixed with _)
+        if (entry.name.startsWith("_"))
+            continue;
         // Check if this directory name starts with an interception convention
         const interceptMatch = matchInterceptConvention(entry.name);
         if (interceptMatch) {
@@ -546,38 +583,69 @@ function collectInterceptingPages(currentDir, interceptRoot, convention, interce
     for (const entry of entries) {
         if (!entry.isDirectory())
             continue;
+        // Skip private folders (prefixed with _)
+        if (entry.name.startsWith("_"))
+            continue;
         collectInterceptingPages(path.join(currentDir, entry.name), interceptRoot, convention, interceptSegment, routeDir, appDir, results, matcher);
     }
 }
+/**
+ * Check whether a path segment is invisible in the URL (route groups, parallel slots, ".").
+ *
+ * Used by computeInterceptTarget, convertSegmentsToRouteParts, and
+ * hasRemainingVisibleSegments — keep this the single source of truth.
+ */
+function isInvisibleSegment(segment) {
+    if (segment === ".")
+        return true;
+    if (segment.startsWith("(") && segment.endsWith(")"))
+        return true;
+    if (segment.startsWith("@"))
+        return true;
+    return false;
+}
 /**
  * Compute the target URL pattern for an intercepting route.
  *
+ * Interception conventions (..), (..)(..)" climb by *visible route segments*
+ * (not filesystem directories). Route groups like (marketing) and parallel
+ * slots like @modal are invisible and must be skipped when counting levels.
+ *
  * - (.) same level: resolve relative to routeDir
- * - (..) one level up: resolve relative to parent of routeDir
- * - (..)(..)" two levels up: resolve relative to grandparent of routeDir
+ * - (..) one level up: climb 1 visible segment
+ * - (..)(..) two levels up: climb 2 visible segments
  * - (...) root: resolve from appDir
  */
 function computeInterceptTarget(convention, interceptSegment, currentDir, interceptRoot, routeDir, appDir) {
-    // Determine the base directory for target resolution
-    let baseDir;
+    // Determine the base segments for target resolution.
+    // We work on route segments (not filesystem paths) so that route groups
+    // and parallel slots are properly skipped when climbing.
+    const routeSegments = path.relative(appDir, routeDir).split(path.sep).filter(Boolean);
+    let baseParts;
     switch (convention) {
         case ".":
-            baseDir = routeDir;
+            baseParts = routeSegments;
             break;
         case "..":
-            baseDir = path.dirname(routeDir);
-            break;
-        case "../..":
-            baseDir = path.dirname(path.dirname(routeDir));
+        case "../..": {
+            const levelsToClimb = convention === ".." ? 1 : 2;
+            let climbed = 0;
+            let cutIndex = routeSegments.length;
+            while (cutIndex > 0 && climbed < levelsToClimb) {
+                cutIndex--;
+                if (!isInvisibleSegment(routeSegments[cutIndex])) {
+                    climbed++;
+                }
+            }
+            baseParts = routeSegments.slice(0, cutIndex);
             break;
+        }
         case "...":
-            baseDir = appDir;
+            baseParts = [];
             break;
         default:
             return null;
     }
-    // Build the target URL segments from baseDir relative to appDir
-    const baseParts = path.relative(appDir, baseDir).split(path.sep).filter(Boolean);
     // Add the intercept segment and any nested path segments
     const nestedParts = path.relative(interceptRoot, currentDir).split(path.sep).filter(Boolean);
     const allSegments = [...baseParts, interceptSegment, ...nestedParts];
@@ -600,19 +668,18 @@ function findFile(dir, name, matcher) {
     }
     return null;
 }
+/**
+ * Convert filesystem path segments to URL route parts, skipping invisible segments
+ * (route groups, @slots, ".") and converting dynamic segment syntax to Express-style
+ * patterns (e.g. "[id]" → ":id", "[...slug]" → ":slug+").
+ */
 function convertSegmentsToRouteParts(segments) {
     const urlSegments = [];
     const params = [];
     let isDynamic = false;
     for (let i = 0; i < segments.length; i++) {
         const segment = segments[i];
-        if (segment === ".")
-            continue;
-        // Route groups are transparent in the URL.
-        if (segment.startsWith("(") && segment.endsWith(")"))
-            continue;
-        // Parallel slots are also transparent.
-        if (segment.startsWith("@"))
+        if (isInvisibleSegment(segment))
             continue;
         // Catch-all segments are only valid in terminal URL position.
         const catchAllMatch = segment.match(/^\[\.\.\.([\w-]+)\]$/);
@@ -640,82 +707,42 @@ function convertSegmentsToRouteParts(segments) {
             urlSegments.push(`:${dynamicMatch[1]}`);
             continue;
         }
-        try {
-            urlSegments.push(decodeURIComponent(segment));
-        }
-        catch {
-            urlSegments.push(segment);
-        }
+        urlSegments.push(decodeRouteSegment(segment));
     }
     return { urlSegments, params, isDynamic };
 }
 function hasRemainingVisibleSegments(segments, startIndex) {
     for (let i = startIndex; i < segments.length; i++) {
-        const segment = segments[i];
-        if (segment.startsWith("(") && segment.endsWith(")"))
-            continue;
-        if (segment.startsWith("@"))
-            continue;
-        return true;
+        if (!isInvisibleSegment(segments[i]))
+            return true;
     }
     return false;
 }
+// Trie cache — keyed by route array identity (same array = same trie)
+const appTrieCache = new WeakMap();
+function getOrBuildAppTrie(routes) {
+    let trie = appTrieCache.get(routes);
+    if (!trie) {
+        trie = buildRouteTrie(routes);
+        appTrieCache.set(routes, trie);
+    }
+    return trie;
+}
+function joinRoutePattern(basePattern, subPath) {
+    if (!subPath)
+        return basePattern;
+    return basePattern === "/" ? `/${subPath}` : `${basePattern}/${subPath}`;
+}
 /**
  * Match a URL against App Router routes.
  */
 export function matchAppRoute(url, routes) {
     const pathname = url.split("?")[0];
     let normalizedUrl = pathname === "/" ? "/" : pathname.replace(/\/$/, "");
-    try {
-        normalizedUrl = decodeURIComponent(normalizedUrl);
-    }
-    catch {
-        /* malformed percent-encoding — match as-is */
-    }
-    // Split URL once, reuse across all route match attempts
+    normalizedUrl = normalizePathnameForRouteMatch(normalizedUrl);
+    // Split URL once, look up via trie
     const urlParts = normalizedUrl.split("/").filter(Boolean);
-    for (const route of routes) {
-        const params = matchPattern(urlParts, route.patternParts);
-        if (params !== null) {
-            return { route, params };
-        }
-    }
-    return null;
-}
-function matchPattern(urlParts, patternParts) {
-    const params = Object.create(null);
-    for (let i = 0; i < patternParts.length; i++) {
-        const pp = patternParts[i];
-        if (pp.endsWith("+")) {
-            if (i !== patternParts.length - 1)
-                return null;
-            const paramName = pp.slice(1, -1);
-            const remaining = urlParts.slice(i);
-            if (remaining.length === 0)
-                return null;
-            params[paramName] = remaining;
-            return params;
-        }
-        if (pp.endsWith("*")) {
-            if (i !== patternParts.length - 1)
-                return null;
-            const paramName = pp.slice(1, -1);
-            const remaining = urlParts.slice(i);
-            params[paramName] = remaining;
-            return params;
-        }
-        if (pp.startsWith(":")) {
-            const paramName = pp.slice(1);
-            if (i >= urlParts.length)
-                return null;
-            params[paramName] = urlParts[i];
-            continue;
-        }
-        if (i >= urlParts.length || urlParts[i] !== pp)
-            return null;
-    }
-    if (urlParts.length !== patternParts.length)
-        return null;
-    return params;
+    const trie = getOrBuildAppTrie(routes);
+    return trieMatch(trie, urlParts);
 }
 //# sourceMappingURL=app-router.js.map