fix: print Request & Response properties

package.json

@@ -56,7 +56,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.14.7",
     "@babel/preset-flow": "7.14.5",
     "@babel/preset-react": "7.14.5",
-    "@edge-runtime/jest-environment": "1.1.0-beta.17",
+    "@edge-runtime/jest-environment": "1.1.0-beta.23",
     "@fullhuman/postcss-purgecss": "1.3.0",
     "@mdx-js/loader": "0.18.0",
     "@next/bundle-analyzer": "workspace:*",

packages/next/compiled/@edge-runtime/primitives/cache.js

@@ -20,7 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/primitives/cache.js
 var cache_exports = {};
 __export(cache_exports, {
-  Cache: () => CacheFromStorage,
+  Cache: () => Cache,
   CacheStorage: () => CacheStorage,
   caches: () => caches,
   createCaches: () => createCaches
@@ -130,53 +130,24 @@ function createCaches() {
   return { Cache: Cache2, cacheStorage };
 }
 __name(createCaches, "createCaches");
-function CacheStorage() {
-  if (!(this instanceof CacheStorage))
-    return new CacheStorage();
-  throw TypeError("Illegal constructor");
-}
-__name(CacheStorage, "CacheStorage");
-function CacheStorageToString() {
-  return "function CacheStorage() { [native code] }";
-}
-__name(CacheStorageToString, "CacheStorageToString");
-Object.defineProperty(CacheStorageToString, "name", {
-  configurable: true,
-  enumerable: false,
-  value: "toString() { [native code] }",
-  writable: true
-});
-Object.defineProperty(CacheStorage, "toString", {
-  configurable: true,
-  enumerable: false,
-  value: CacheStorageToString,
-  writable: true
-});
 function Cache() {
   if (!(this instanceof Cache))
     return new Cache();
   throw TypeError("Illegal constructor");
 }
 __name(Cache, "Cache");
-function CacheToString() {
-  return "function Cache() { [native code] }";
+function CacheStorage() {
+  if (!(this instanceof CacheStorage))
+    return new CacheStorage();
+  throw TypeError("Illegal constructor");
 }
-__name(CacheToString, "CacheToString");
-Object.defineProperty(CacheToString, "name", {
-  configurable: true,
-  enumerable: false,
-  value: "toString() { [native code] }",
-  writable: true
-});
-Object.defineProperty(Cache, "toString", {
-  configurable: true,
-  enumerable: false,
-  value: CacheToString,
-  writable: true
-});
-var cachesStorage = createCaches();
-var CacheFromStorage = cachesStorage.Cache;
-var caches = cachesStorage.cacheStorage();
+__name(CacheStorage, "CacheStorage");
+var caches = (() => {
+  const { cacheStorage } = createCaches();
+  const caches2 = cacheStorage();
+  caches2.open("default");
+  return caches2;
+})();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Cache,

packages/next/compiled/@edge-runtime/primitives/console.js

@@ -105,6 +105,15 @@ var require_dist = __commonJS({
         if (formattedPrimitive !== void 0) {
           return formattedPrimitive;
         }
+        const symbols = Object.getOwnPropertySymbols(value);
+        if (symbols.length > 0) {
+          symbols.forEach((symbol) => {
+            const obj = value;
+            const symbolKey = `[${symbol.toString()}]`;
+            obj[symbolKey] = obj[symbol];
+            delete obj[symbol];
+          });
+        }
         const keys = ctx.showHidden ? Object.getOwnPropertyNames(value) : Object.keys(value);
         const visibleKeys = /* @__PURE__ */ new Set();
         keys.forEach((key) => visibleKeys.add(key));
@@ -121,8 +130,10 @@ var require_dist = __commonJS({
             return format2(value[ctx.customInspectSymbol]());
           }
         }
+        const isValueFunction = kind(value, "function");
+        const isValueArray = Array.isArray(value);
         let base = "";
-        if (kind(value, "function")) {
+        if (isValueFunction) {
           base = `[Function${value.name ? ": " + value.name : ""}]`;
         } else if (isRegExp(value)) {
           base = " " + RegExp.prototype.toString.call(value);
@@ -133,25 +144,25 @@ var require_dist = __commonJS({
         } else if (hasCustomSymbol(value, ctx.customInspectSymbol)) {
           base = " " + value[ctx.customInspectSymbol]();
         }
-        const braces = Array.isArray(value) ? ["[", "]"] : ["{", "}"];
-        if (keys.length === 0 && (!Array.isArray(value) || value.length === 0)) {
+        const braces = isValueArray ? ["[", "]"] : isValueFunction ? ["", ""] : ["{", "}"];
+        if (keys.length === 0 && (!isValueArray || value.length === 0)) {
           return braces[0] + base + braces[1];
         }
         if (recurseTimes && recurseTimes < 0) {
           return isRegExp(value) ? RegExp.prototype.toString.call(value) : "[Object]";
         }
         ctx.seen.push(value);
-        const output = Array.isArray(value) ? formatArray(ctx, value, recurseTimes, visibleKeys, keys) : keys.map((key) => formatProperty(ctx, value, recurseTimes, visibleKeys, key, false));
+        let output = isValueArray ? formatArray(ctx, value, recurseTimes, visibleKeys, keys) : keys.map((key) => formatProperty(ctx, value, recurseTimes, visibleKeys, key, false));
         ctx.seen.pop();
-        return reduceToSingleString(output, base, braces);
+        return reduceToSingleString(output, base, braces, isValueFunction);
       }
       __name(formatValue, "formatValue");
       function inspect(value, opts2) {
         opts2 = Object.assign({ seen: [], depth: 2 }, opts2);
         return formatValue(opts2, value, opts2.depth);
       }
       __name(inspect, "inspect");
-      function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+      function formatProperty(ctx, value, recurseTimes, visibleKeys, key, isArray) {
         let name;
         let str;
         const desc = Object.getOwnPropertyDescriptor(value, key) || {
@@ -169,7 +180,7 @@ var require_dist = __commonJS({
           if (ctx.seen.indexOf(desc.value) < 0) {
             str = formatValue(ctx, desc.value, recurseTimes === null || recurseTimes === void 0 ? null : recurseTimes - 1);
             if (str.indexOf("\n") > -1) {
-              if (array) {
+              if (isArray) {
                 str = str.split("\n").map((line) => `  ${line}`).join("\n").slice(2);
               } else {
                 str = "\n" + str.split("\n").map((line) => `   ${line}`).join("\n");
@@ -180,17 +191,11 @@ var require_dist = __commonJS({
           }
         }
         if (name === void 0) {
-          if (array && key.match(/^\d+$/)) {
+          if (isArray && key.match(/^\d+$/)) {
             return str;
           }
-          name = JSON.stringify("" + key);
-          if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
-            name = name.slice(1, -1);
-          } else {
-            name = name.replace(/'/g, "\\'").replace(/\\"/g, '"').replace(/(^"|"$)/g, "'");
-          }
         }
-        return `${name}: ${str}`;
+        return `${key}: ${str}`;
       }
       __name(formatProperty, "formatProperty");
       function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
@@ -252,14 +257,18 @@ var require_dist = __commonJS({
       return kind(value, "object") && (Object.prototype.toString.call(value) === "[object Error]" || value instanceof Error);
     }
     __name(isError, "isError");
-    function reduceToSingleString(output, base, braces) {
+    function reduceToSingleString(output, base, braces, isValueFunction) {
       const length = output.reduce((prev, cur) => {
         return prev + cur.replace(/\u001b\[\d\d?m/g, "").length + 1;
       }, 0);
       if (length > 60) {
-        return braces[0] + (base === "" ? "" : base + "\n ") + " " + output.join(",\n  ") + " " + braces[1];
+        const prefix2 = isValueFunction ? " {" : "";
+        const suffix2 = isValueFunction ? "\n}" : " ";
+        return braces[0] + (base === "" ? "" : base + prefix2 + "\n ") + ` ${output.join(",\n  ")}` + suffix2 + braces[1];
       }
-      return braces[0] + base + " " + output.join(", ") + " " + braces[1];
+      const prefix = isValueFunction ? " { " : " ";
+      const suffix = isValueFunction ? " } " : " ";
+      return (braces[0] + base + prefix + output.join(", ") + suffix + braces[1]).trim();
     }
     __name(reduceToSingleString, "reduceToSingleString");
     function safeStringify(object) {

packages/next/compiled/@edge-runtime/primitives/crypto.js

@@ -9551,22 +9551,6 @@ function SubtleCrypto3() {
   throw TypeError("Illegal constructor");
 }
 __name(SubtleCrypto3, "SubtleCrypto");
-function SubtleCryptoToString() {
-  return "function SubtleCrypto() { [native code] }";
-}
-__name(SubtleCryptoToString, "SubtleCryptoToString");
-Object.defineProperty(SubtleCryptoToString, "name", {
-  configurable: true,
-  enumerable: false,
-  value: "toString() { [native code] }",
-  writable: true
-});
-Object.defineProperty(SubtleCrypto3, "toString", {
-  configurable: true,
-  enumerable: false,
-  value: SubtleCryptoToString,
-  writable: true
-});
 var crypto2 = new Crypto3();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

packages/next/compiled/@edge-runtime/primitives/fetch.js

@@ -4249,9 +4249,9 @@ var require_pool_base = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/undici@5.5.1/node_modules/undici/lib/core/request.js
-var require_request2 = __commonJS({
-  "../../node_modules/.pnpm/undici@5.5.1/node_modules/undici/lib/core/request.js"(exports, module2) {
+// src/patches/undici-core-request.js
+var require_undici_core_request = __commonJS({
+  "src/patches/undici-core-request.js"(exports, module2) {
     "use strict";
     init_define_process();
     var {
@@ -4408,7 +4408,10 @@ var require_request2 = __commonJS({
         assert(!this.aborted);
         assert(!this.completed);
         if (channels.headers.hasSubscribers) {
-          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+          channels.headers.publish({
+            request: this,
+            response: { statusCode, headers, statusText }
+          });
         }
         return this[kHandler].onHeaders(statusCode, headers, resume, statusText);
       }
@@ -4463,14 +4466,6 @@ var require_request2 = __commonJS({
         request.contentType = val;
         request.headers += `${key}: ${val}\r
 `;
-      } else if (key.length === 17 && key.toLowerCase() === "transfer-encoding") {
-        throw new InvalidArgumentError2("invalid transfer-encoding header");
-      } else if (key.length === 10 && key.toLowerCase() === "connection") {
-        throw new InvalidArgumentError2("invalid connection header");
-      } else if (key.length === 10 && key.toLowerCase() === "keep-alive") {
-        throw new InvalidArgumentError2("invalid keep-alive header");
-      } else if (key.length === 7 && key.toLowerCase() === "upgrade") {
-        throw new InvalidArgumentError2("invalid upgrade header");
       } else if (key.length === 6 && key.toLowerCase() === "expect") {
         throw new NotSupportedError("expect header not supported");
       } else {
@@ -5083,7 +5078,7 @@ var require_client = __commonJS({
     var assert = require("assert");
     var net = require("net");
     var util = require_util();
-    var Request2 = require_request2();
+    var Request2 = require_undici_core_request();
     var DispatcherBase = require_dispatcher_base();
     var RedirectHandler = require_redirect();
     var {

packages/next/compiled/@edge-runtime/primitives/package.json

@@ -1 +1 @@
-{"name":"@edge-runtime/primitives","version":"1.1.0-beta.17","main":"./index.js","license":"MPLv2"}
+{"name":"@edge-runtime/primitives","version":"1.1.0-beta.23","main":"./index.js","license":"MPLv2"}

packages/next/compiled/@edge-runtime/primitives/url.js

@@ -3328,10 +3328,10 @@ module.exports = __toCommonJS(url_exports);
 init_define_process();
 var import_whatwg_url = __toESM(require_whatwg_url());
 
-// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.3/node_modules/urlpattern-polyfill/index.js
+// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.5/node_modules/urlpattern-polyfill/index.js
 init_define_process();
 
-// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.3/node_modules/urlpattern-polyfill/dist/urlpattern.js
+// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.5/node_modules/urlpattern-polyfill/dist/urlpattern.js
 init_define_process();
 var regexIdentifierStart = /[$_\p{ID_Start}]/u;
 var regexIdentifierPart = /[$_\u200C\u200D\p{ID_Continue}]/u;
@@ -4573,7 +4573,7 @@ var URLPattern = /* @__PURE__ */ __name(class {
   }
 }, "URLPattern");
 
-// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.3/node_modules/urlpattern-polyfill/index.js
+// ../../node_modules/.pnpm/urlpattern-polyfill@5.0.5/node_modules/urlpattern-polyfill/index.js
 if (!globalThis.URLPattern) {
   globalThis.URLPattern = URLPattern;
 }

packages/next/compiled/webpack/bundle5.js

@@ -9372,7 +9372,7 @@ Long.fromBytesBE = function fromBytesBE(bytes, unsigned) {
 
 /***/ }),
 
-/***/ 81579:
+/***/ 90099:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -100575,7 +100575,7 @@ module.exports.chunkHasJs = chunkHasJs;
 
 
 const { Parser: AcornParser } = __webpack_require__(31988);
-const { importAssertions } = __webpack_require__(81579);
+const { importAssertions } = __webpack_require__(90099);
 const { SyncBailHook, HookMap } = __webpack_require__(44217);
 const vm = __webpack_require__(26144);
 const Parser = __webpack_require__(68646);

packages/next/package.json

@@ -117,7 +117,7 @@
     "@babel/runtime": "7.15.4",
     "@babel/traverse": "7.18.0",
     "@babel/types": "7.18.0",
-    "@edge-runtime/primitives": "1.1.0-beta.17",
+    "@edge-runtime/primitives": "1.1.0-beta.23",
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.4.4",
     "@napi-rs/triples": "1.1.0",
@@ -194,7 +194,7 @@
     "debug": "4.1.1",
     "devalue": "2.0.1",
     "domain-browser": "4.19.0",
-    "edge-runtime": "1.1.0-beta.17",
+    "edge-runtime": "1.1.0-beta.23",
     "events": "3.3.0",
     "find-cache-dir": "3.3.1",
     "find-up": "4.1.0",

packages/next/server/web/spec-extension/cookies.ts

@@ -56,6 +56,9 @@ export class Cookies extends Map<string, string> {
       )
     )
   }
+  [Symbol.for('edge-runtime.inspect.custom')]() {
+    return Object.fromEntries(this.entries())
+  }
 }
 
 export class NextCookies extends Cookies {

packages/next/server/web/spec-extension/request.ts

@@ -31,6 +31,30 @@ export class NextRequest extends Request {
     }
   }
 
+  [Symbol.for('edge-runtime.inspect.custom')]() {
+    return {
+      cookies: this.cookies,
+      geo: this.geo,
+      ip: this.ip,
+      nextUrl: this.nextUrl,
+      url: this.url,
+      // rest of props come from Request
+      bodyUsed: this.bodyUsed,
+      cache: this.cache,
+      credentials: this.credentials,
+      destination: this.destination,
+      headers: Object.fromEntries(this.headers),
+      integrity: this.integrity,
+      keepalive: this.keepalive,
+      method: this.method,
+      mode: this.mode,
+      redirect: this.redirect,
+      referrer: this.referrer,
+      referrerPolicy: this.referrerPolicy,
+      signal: this.signal,
+    }
+  }
+
   public get cookies() {
     return this[INTERNALS].cookies
   }

packages/next/server/web/spec-extension/response.ts

@@ -27,6 +27,22 @@ export class NextResponse extends Response {
     }
   }
 
+  [Symbol.for('edge-runtime.inspect.custom')]() {
+    return {
+      cookies: this.cookies,
+      url: this.url,
+      // rest of props come from Response
+      body: this.body,
+      bodyUsed: this.bodyUsed,
+      headers: Object.fromEntries(this.headers),
+      ok: this.ok,
+      redirected: this.redirected,
+      status: this.status,
+      statusText: this.statusText,
+      type: this.type,
+    }
+  }
+
   public get cookies() {
     return this[INTERNALS].cookies
   }