srvx 0.7.2 → 0.7.3

package/dist/adapters/node.mjs

@@ -222,7 +222,7 @@ function _normalizeValue(value) {
 	return typeof value === "string" ? value : String(value ?? "");
 }
 function validateHeader(name) {
-	if (name[0] === ":") throw new TypeError("Invalid header name");
+	if (name[0] === ":") throw new TypeError(`${JSON.stringify(name)} is an invalid header name.`);
 	return name.toLowerCase();
 }
 
@@ -577,13 +577,13 @@ const NodeResponse = /* @__PURE__ */ (() => {
 			const statusText = this.#init?.statusText ?? "";
 			const headers = [];
 			const headersInit = this.#init?.headers;
-			if (headersInit) {
+			if (this.#headersObj) for (const [key, value] of this.#headersObj) if (key === "set-cookie") for (const setCookie of splitSetCookieString(value)) headers.push(["set-cookie", setCookie]);
+			else headers.push([key, value]);
+			else if (headersInit) {
 				const headerEntries = Array.isArray(headersInit) ? headersInit : headersInit.entries ? headersInit.entries() : Object.entries(headersInit);
 				for (const [key, value] of headerEntries) if (key === "set-cookie") for (const setCookie of splitSetCookieString(value)) headers.push(["set-cookie", setCookie]);
 				else headers.push([key, value]);
 			}
-			if (this.#headersObj) for (const [key, value] of this.#headersObj) if (key === "set-cookie") for (const setCookie of splitSetCookieString(value)) headers.push(["set-cookie", setCookie]);
-			else headers.push([key, value]);
 			const bodyInit = this.#body;
 			let body;
 			if (bodyInit) if (typeof bodyInit === "string") body = bodyInit;
@@ -602,6 +602,8 @@ const NodeResponse = /* @__PURE__ */ (() => {
 			}
 			this.#body = void 0;
 			this.#init = void 0;
+			this.#headersObj = void 0;
+			this.#responseObj = void 0;
 			return {
 				status,
 				statusText,
@@ -615,11 +617,18 @@ const NodeResponse = /* @__PURE__ */ (() => {
 		#headersObj;
 		clone() {
 			if (this.#responseObj) return this.#responseObj.clone();
+			if (this.#headersObj) return new globalThis.Response(this.#body, {
+				...this.#init,
+				headers: new Headers(this.#headersObj)
+			});
 			return new globalThis.Response(this.#body, this.#init);
 		}
 		get #response() {
 			if (!this.#responseObj) {
-				this.#responseObj = new globalThis.Response(this.#body, this.#init);
+				this.#responseObj = this.#headersObj ? new globalThis.Response(this.#body, {
+					...this.#init,
+					headers: new Headers(this.#headersObj)
+				}) : new globalThis.Response(this.#body, this.#init);
 				this.#body = void 0;
 				this.#init = void 0;
 				this.#headersObj = void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "homepage": "https://srvx.h3.dev",
   "repository": "h3js/srvx",
@@ -40,11 +40,11 @@
     "lint:fix": "automd && eslint . --fix && prettier -w .",
     "node-ts": "node --disable-warning=ExperimentalWarning --experimental-strip-types",
     "prepack": "pnpm build",
-    "play:bun": "bun playground/app.mjs",
+    "play:bun": "bun --watch playground/app.mjs",
     "play:cf": "pnpx wrangler dev playground/app.mjs",
-    "play:deno": "deno run -A playground/app.mjs",
+    "play:deno": "deno run -A --watch playground/app.mjs",
     "play:mkcert": "openssl req -x509 -newkey rsa:2048 -nodes -keyout server.key -out server.crt -days 365 -subj /CN=srvx.local",
-    "play:node": "pnpm node-ts playground/app.mjs",
+    "play:node": "pnpm node-ts --watch playground/app.mjs",
     "play:sw": "pnpm build && pnpx serve playground",
     "release": "pnpm test && changelogen --release && npm publish && git push --follow-tags",
     "test": "pnpm lint && pnpm test:types && vitest run --coverage",