Fix rewrite query not forwarded and api destination

.changeset/red-starfishes-wave.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/aws": patch
+---
+
+Fix api rewrite destination with i18n and query not forwarded on rewrite

examples/pages-router/next.config.ts

@@ -26,6 +26,7 @@ const nextConfig: NextConfig = {
   ],
   rewrites: async () => [
     { source: "/rewrite", destination: "/", locale: false },
+    { source: "/rewriteWithQuery", destination: "/api/query?q=1" },
     {
       source: "/rewriteUsingQuery",
       destination: "/:destination/",

examples/pages-router/src/pages/api/query.ts

@@ -0,0 +1,5 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+  res.status(200).json({ query: req.query });
+}

packages/open-next/src/core/routing/matcher.ts

@@ -227,11 +227,23 @@ export function handleRewrites<T extends RewriteDefinition>(
       rewrittenHost = unescapeRegex(toDestinationHost(params));
       rewrittenQuery = unescapeRegex(toDestinationQuery(params));
     }
+
+    // We need to strip the locale from the path if it's a local api route
+    if (NextConfig.i18n && !isExternalRewrite) {
+      const strippedPathLocale = rewrittenPath.replace(
+        new RegExp(`^/(${NextConfig.i18n.locales.join("|")})`),
+        "",
+      );
+      if (strippedPathLocale.startsWith("/api/")) {
+        rewrittenPath = strippedPathLocale;
+      }
+    }
+
     rewrittenUrl = isExternalRewrite
       ? `${protocol}//${rewrittenHost}${rewrittenPath}`
       : new URL(rewrittenPath, event.url).href;
 
-    // Should we merge the query params or use only the ones from the rewrite?
+    // We merge query params from the source and the destination
     finalQuery = {
       ...query,
       ...convertFromQueryString(rewrittenQuery),
@@ -243,6 +255,7 @@ export function handleRewrites<T extends RewriteDefinition>(
   return {
     internalEvent: {
       ...event,
+      query: finalQuery,
       rawPath: new URL(rewrittenUrl).pathname,
       url: rewrittenUrl,
     },

packages/tests-e2e/tests/pagesRouter/rewrite.test.ts

@@ -23,3 +23,15 @@ test("Rewrite to external image", async ({ request }) => {
   expect(response.headers()["content-type"]).toBe("image/png");
   expect(validateMd5(await response.body(), EXT_PNG_MD5)).toBe(true);
 });
+
+test("Rewrite with query in destination", async ({ request }) => {
+  const response = await request.get("/rewriteWithQuery");
+  expect(response.status()).toBe(200);
+  expect(await response.json()).toEqual({ query: { q: "1" } });
+});
+
+test("Rewrite with query should merge query params", async ({ request }) => {
+  const response = await request.get("/rewriteWithQuery?b=2");
+  expect(response.status()).toBe(200);
+  expect(await response.json()).toEqual({ query: { q: "1", b: "2" } });
+});

packages/tests-unit/tests/core/routing/matcher.test.ts

@@ -395,6 +395,10 @@ describe("handleRewrites", () => {
     expect(result).toEqual({
       internalEvent: {
         ...event,
+        query: {
+          album: "foo",
+          song: "bar",
+        },
         rawPath: "/search",
         url: "https://external.com/search?album=foo&song=bar",
       },