Reverse execution order of Pages Functions middlewares (#217)

* Sort root requests, /, last

* Reverse execution order of Pages Functions middlewares

Author: GregBrimble

.changeset/fuzzy-ads-rush.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Reverse execution order of Pages Functions middlewares

packages/wrangler/pages/functions/filepath-routing.test.ts

@@ -1,8 +1,15 @@
 import { compareRoutes } from "./filepath-routing";
 
 describe("compareRoutes()", () => {
+  test("routes / last", () => {
+    expect(compareRoutes("/", "/foo")).toBeGreaterThanOrEqual(1);
+    expect(compareRoutes("/", "/:foo")).toBeGreaterThanOrEqual(1);
+    expect(compareRoutes("/", "/:foo*")).toBeGreaterThanOrEqual(1);
+  });
+
   test("routes with fewer segments come after those with more segments", () => {
-    expect(compareRoutes("/foo", "/foo/bar")).toBe(1);
+    expect(compareRoutes("/foo", "/foo/bar")).toBeGreaterThanOrEqual(1);
+    expect(compareRoutes("/foo", "/foo/bar/cat")).toBeGreaterThanOrEqual(1);
   });
 
   test("routes with wildcard segments come after those without", () => {

packages/wrangler/pages/functions/filepath-routing.ts

@@ -162,7 +162,7 @@ export function compareRoutes(a: string, b: string) {
       method = null;
     }
 
-    const segments = segmentedPath.slice(1).split("/");
+    const segments = segmentedPath.slice(1).split("/").filter(Boolean);
     return [method, segments];
   }
 

packages/wrangler/pages/functions/template-worker.ts

@@ -43,8 +43,8 @@ type WorkerContext = {
 function* executeRequest(request: Request, env: Env) {
   const requestPath = new URL(request.url).pathname;
 
-  // First, iterate through the routes and execute "middlewares" on partial route matches
-  for (const route of routes) {
+  // First, iterate through the routes (backwards) and execute "middlewares" on partial route matches
+  for (const route of [...routes].reverse()) {
     if (
       route.methods.length &&
       !route.methods.includes(request.method as HTTPMethod)