@fastly/expressly 1.0.0-alpha.5 → 1.0.0-alpha.8

package/dist/lib/routing/response/index.js

@@ -35,8 +35,10 @@ class EResponseBase {
             return;
         if (response instanceof Response) {
             this.body = response.body;
-            this.headers = response.headers;
-            this.status = response.status;
+            // Append, rather than overwrite headers.
+            response.headers.forEach((value, key) => this.headers.append(key, value));
+            // Do not overwrite user-defined status.
+            this.status = this.status || response.status;
         }
         else {
             this.body = response;

package/dist/lib/routing/router.js

@@ -14,7 +14,7 @@ const defaultErrorHandler = (auto405) => async (err, req, res) => {
         return res.sendStatus(405);
     }
     console.error(err);
-    res.withStatus(500).json({ error: err });
+    res.withStatus(500).json({ error: err.message });
 };
 export class Router {
     constructor(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/expressly",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.8",
   "description": "Express-style router for Fastly's Compute@Edge.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,18 +32,18 @@
     "@types/node": "^17.0.40",
     "auto": "^10.37.1",
     "husky": "^8.0.1",
-    "nodemon": "^2.0.16",
-    "prettier": "^2.6.2",
+    "nodemon": "^2.0.18",
+    "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
-    "ts-loader": "^9.3.0",
-    "typescript": "^4.7.3",
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.7.4",
     "webpack": "^5.73.0",
-    "webpack-cli": "^4.9.2"
+    "webpack-cli": "^4.10.0"
   },
   "dependencies": {
-    "@fastly/js-compute": "^0.2.4",
+    "@fastly/js-compute": "^0.3.0",
     "cookie": "^0.5.0",
-    "core-js": "^3.22.8",
+    "core-js": "^3.23.3",
     "path-to-regexp": "^6.2.1"
   },
   "auto": {

package/dist/lib/routing/mixin.d.ts

@@ -1 +0,0 @@
-export declare function applyMixins(derivedConstructor: any, baseConstructors: any[]): void;

package/dist/lib/routing/mixin.js

@@ -1,9 +0,0 @@
-export function applyMixins(derivedConstructor, baseConstructors) {
-    baseConstructors.forEach(baseConstructor => {
-        Object.getOwnPropertyNames(baseConstructor.prototype).forEach(name => {
-            if (name !== 'constructor') {
-                derivedConstructor.prototype[name] = baseConstructor.prototype[name];
-            }
-        });
-    });
-}

package/dist/lib/routing/request/request-url.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="@fastly/js-compute" />
-export declare class CookieMap extends Map {
-    private headers;
-    constructor(headers: Headers);
-    clear(): void;
-    set(key: string, value: string): this;
-    delete(key: string): boolean;
-    private serialize;
-}

package/dist/lib/routing/request/request-url.js

@@ -1,37 +0,0 @@
-import cookie from "cookie";
-export class CookieMap extends Map {
-    constructor(headers) {
-        super();
-        this.headers = headers;
-        if (Boolean(this.headers.get("Cookie"))) {
-            for (const [key, value] of Object.entries(cookie.parse(this.headers.get("Cookie")))) {
-                if (typeof value === "string") {
-                    super.set(key, value);
-                }
-            }
-        }
-    }
-    clear() {
-        this.headers.delete("Cookie");
-        super.clear();
-    }
-    set(key, value) {
-        super.set(key, value);
-        this.serialize();
-        return this;
-    }
-    delete(key) {
-        const deleteResult = super.delete(key);
-        this.serialize();
-        return deleteResult;
-    }
-    serialize() {
-        if (this.size) {
-            const cookies = [];
-            for (const [key, value] of this.entries()) {
-                cookies.push(cookie.serialize(key, value));
-            }
-            this.headers.set("Cookie", cookies.join("; "));
-        }
-    }
-}