@fastly/expressly 1.0.0-alpha.1 → 1.0.0-alpha.4

package/README.md

@@ -17,11 +17,11 @@ First, head over to [developer.fastly.com](https://developer.fastly.com) to get
 Install expressly from the [npm registry](https://www.npmjs.com/package/@fastly/expressly):
 
 ```shell
-npm i @fastly/expressly
+npm i @fastly/expressly@1.0.0-alpha.4
 ```
 
 ```shell
-yarn add @fastly/expressly
+yarn add @fastly/expressly@1.0.0-alpha.4
 ```
 
 ### Your first expressly app

package/dist/lib/routing/request/index.d.ts

@@ -1,14 +1,13 @@
 /// <reference types="@fastly/js-compute" />
-import { ECommonObject } from "../common";
 import { CookieMap } from "./cookie-map";
 import { EConfig } from "..";
-export declare class ERequest extends ECommonObject {
+export declare class ERequest extends Request {
     private config;
     private event;
     readonly clientInfo: ClientInfo;
     readonly method: string;
     headers: Headers;
-    url: URL;
+    urlObj: URL;
     query: URLSearchParams;
     params: {
         [key: string]: string;
@@ -21,7 +20,11 @@ export declare class ERequest extends ECommonObject {
     get secure(): boolean;
     get subdomains(): Array<string>;
     get hostname(): string;
-    json(): Promise<any>;
-    text(): Promise<string>;
-    arrayBuffer(): Promise<ArrayBuffer>;
+    set(headerNameOrObject: string | {
+        [key: string]: string;
+    }, value?: string): void;
+    private appendHeader;
+    append(headerNameOrObject: string | {
+        [key: string]: string | string[];
+    }, value?: string | string[]): void;
 }

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

@@ -1,47 +1,70 @@
-import { ECommonObject } from "../common";
 import { CookieMap } from "./cookie-map";
-export class ERequest extends ECommonObject {
+export class ERequest extends Request {
     constructor(config, event) {
-        super();
+        super(event.request);
         this.config = config;
         this.event = event;
         this.params = {};
         this.clientInfo = event.client;
-        this.method = event.request.method;
-        this.url = new URL(event.request.url);
-        this.query = this.url.searchParams;
-        this.headers = event.request.headers;
+        this.urlObj = new URL(event.request.url);
+        this.query = this.urlObj.searchParams;
         // Parse cookies.
         if (this.config.parseCookie) {
             this.cookies = new CookieMap(this.headers);
         }
     }
     // Express-like URL helpers.
+    // get url(): string {
+    //   console.log("custom getter");
+    //   return this.urlObj.toString();
+    // }
     get path() {
-        return this.url.pathname;
+        return this.urlObj.pathname;
     }
     get ip() {
         return this.clientInfo.address;
     }
     get protocol() {
-        return this.url.protocol;
+        return this.urlObj.protocol;
     }
     get secure() {
-        return this.url.protocol === "https";
+        return this.urlObj.protocol === "https";
     }
     get subdomains() {
-        return this.url.hostname.split(".").slice(0, -2);
+        return this.urlObj.hostname.split(".").slice(0, -2);
     }
     get hostname() {
-        return this.url.hostname;
+        return this.urlObj.hostname;
     }
-    async json() {
-        return await this.event.request.json();
+    // Header helpers.
+    set(headerNameOrObject, value) {
+        if (typeof headerNameOrObject === "string") {
+            this.headers.set(headerNameOrObject, value);
+        }
+        else {
+            Object.keys(headerNameOrObject).forEach((headerName) => {
+                this.headers.set(headerName, headerNameOrObject[headerName]);
+            });
+        }
     }
-    async text() {
-        return await this.event.request.text();
+    appendHeader(headerName, headerValue) {
+        if (typeof headerValue === "string") {
+            this.headers.append(headerName, headerValue);
+        }
+        else if (Array.isArray(headerValue)) {
+            headerValue.forEach((v) => {
+                this.headers.append(headerName, v);
+            });
+        }
     }
-    async arrayBuffer() {
-        return await this.event.request.arrayBuffer();
+    append(headerNameOrObject, value) {
+        if (typeof headerNameOrObject === "string") {
+            this.appendHeader(headerNameOrObject, value);
+        }
+        else {
+            Object.keys(headerNameOrObject).forEach((headerName) => {
+                this.appendHeader(headerName, headerNameOrObject[headerName]);
+            });
+        }
     }
 }

package/dist/lib/routing/router.js

@@ -140,7 +140,7 @@ export class Router {
                     pathMatcherCache.set(pattern, match(pattern, { decode: decodeURIComponent }));
                 }
                 // Match on pathname.
-                let { path, params } = pathMatcherCache.get(pattern)(req.url.pathname) || {};
+                let { path, params } = pathMatcherCache.get(pattern)(req.urlObj.pathname) || {};
                 if (path) {
                     if (this.config.extractRequestParameters) {
                         req.params = params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/expressly",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.4",
   "description": "Express-style router for Fastly's Compute@Edge.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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

@@ -1,10 +0,0 @@
-import ERequest from "./request";
-import EResponse from "./response";
-export declare type MiddlewareCallback = (req: ERequest, res: EResponse, next?: () => void) => Promise<any>;
-export declare class Middleware {
-    private matchFn;
-    private callback;
-    constructor(matchFn: Function, callback: MiddlewareCallback);
-    check(event: ERequest): 0 | 404 | 405;
-    run(req: ERequest, res: EResponse): Promise<any>;
-}

package/dist/lib/routing/middleware.js

@@ -1,13 +0,0 @@
-export class Middleware {
-    constructor(matchFn, callback) {
-        this.matchFn = matchFn;
-        this.callback = callback;
-    }
-    check(event) {
-        return this.matchFn(event);
-    }
-    async run(req, res) {
-        // Supply an empty callback as an equivalent of next() in Express.js.
-        await this.callback(req, res, () => { });
-    }
-}

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

@@ -1,10 +0,0 @@
-import ERequest from "./request";
-import EResponse from "./response";
-export declare type RequestHandlerCallback = (req: ERequest, res: EResponse) => Promise<any>;
-export declare class Route {
-    private matchFn;
-    private callback;
-    constructor(matchFn: Function, callback: RequestHandlerCallback);
-    check(event: ERequest): 0 | 404 | 405;
-    run(req: ERequest, res: EResponse): Promise<any>;
-}

package/dist/lib/routing/route.js

@@ -1,12 +0,0 @@
-export class Route {
-    constructor(matchFn, callback) {
-        this.matchFn = matchFn;
-        this.callback = callback;
-    }
-    check(event) {
-        return this.matchFn(event);
-    }
-    async run(req, res) {
-        await this.callback(req, res);
-    }
-}