review

Author: conico974

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

@@ -5,7 +5,7 @@ import { Readable } from "node:stream";
 import { BuildId, HtmlPages, NextConfig } from "config/index.js";
 import type { IncomingMessage } from "http/index.js";
 import { OpenNextNodeResponse } from "http/openNextResponse.js";
-import { parseHeaders } from "http/util.js";
+import { getQueryFromIterator, parseHeaders } from "http/util.js";
 import type {
   FunctionsConfigManifest,
   MiddlewareManifest,
@@ -38,21 +38,11 @@ export function isExternal(url?: string, host?: string) {
 export function convertFromQueryString(query: string) {
   if (query === "") return {};
   const queryParts = query.split("&");
-  return queryParts.reduce(
-    (acc, part) => {
-      const [key, value] = part.split("=");
-      if (key in acc) {
-        if (Array.isArray(acc[key])) {
-          acc[key].push(value);
-        } else {
-          acc[key] = [acc[key], value];
-        }
-      } else {
-        acc[key] = value;
-      }
-      return acc;
-    },
-    {} as Record<string, string | string[]>,
+  return getQueryFromIterator(
+    queryParts.map((p) => {
+      const [key, value] = p.split("=");
+      return [key, value] as const;
+    }),
   );
 }
 

packages/open-next/src/http/util.ts

@@ -39,3 +39,25 @@ export function parseCookies(
     ? cookies.split(/(?<!Expires=\w+),/i).map((c) => c.trim())
     : cookies;
 }
+
+/**
+ *
+ * Get the query object from an iterable of [key, value] pairs
+ * @param it - The iterable of [key, value] pairs
+ * @returns The query object
+ */
+export function getQueryFromIterator(it: Iterable<[string, string]>) {
+  const query: Record<string, string | string[]> = {};
+  for (const [key, value] of it) {
+    if (key in query) {
+      if (Array.isArray(query[key])) {
+        query[key].push(value);
+      } else {
+        query[key] = [query[key], value];
+      }
+    } else {
+      query[key] = value;
+    }
+  }
+  return query;
+}

packages/open-next/src/overrides/converters/utils.ts

@@ -1,3 +1,5 @@
+import { getQueryFromIterator } from "http/util.js";
+
 export function removeUndefinedFromQuery(
   query: Record<string, string | string[] | undefined>,
 ) {
@@ -29,17 +31,5 @@ export function extractHostFromHeaders(
  * @returns
  */
 export function getQueryFromSearchParams(searchParams: URLSearchParams) {
-  const query: Record<string, string | string[]> = {};
-  for (const [key, value] of searchParams.entries()) {
-    if (key in query) {
-      if (Array.isArray(query[key])) {
-        query[key].push(value);
-      } else {
-        query[key] = [query[key], value];
-      }
-    } else {
-      query[key] = value;
-    }
-  }
-  return query;
+  return getQueryFromIterator(searchParams.entries());
 }