'this' in res methods (#13)

tlaziuk · Aug 19, 2017 · 369f714 · 369f714
1 parent f0efd5e
commit 369f714
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/index.spec.ts b/index.spec.ts
@@ -224,4 +224,19 @@ describe(middleware.name, () => {
             done(err);
         }
     });
+    it("should this in res methods be instance of Response", async (done) => {
+        try {
+            const handler = middleware(routes);
+            const res = mockRes();
+            const req = mockReq({ path: "/" });
+            const next = spy();
+            await handler(req as any, res as any, next as any);
+            expect(res.send.called).to.be.equal(true, `'res.send' was not called`);
+            expect(res.send.firstCall.thisValue).to.be.not.a("undefined", `'this' is undefined`);
+            expect(res.send.firstCall.thisValue).to.be.equal(res, `'res.send' not called with the 'res' as 'this'`);
+            done();
+        } catch (err) {
+            done(err);
+        }
+    });
 });
diff --git a/index.ts b/index.ts
@@ -37,20 +37,21 @@ export function mithrilExpressMiddleware(
             html = (partial: Promise<string>) => partial,
         } = opt;
         try {
-            res.send(
-                await html(
-                    routeRender(
-                        routes,
-                        req.path,
-                        defaultRoute,
-                        {
-                            ...(attrsCookies && req.cookies ? req.cookies : {}),
-                            ...(attrsBody && req.body ? req.body : {}),
-                            ...(attrsQuery && req.query ? req.query : {}),
-                            ...attrs,
-                        },
-                    ),
+            const doc = await html(
+                routeRender(
+                    routes,
+                    req.path,
+                    defaultRoute,
+                    {
+                        ...(attrsCookies && req.cookies ? req.cookies : {}),
+                        ...(attrsBody && req.body ? req.body : {}),
+                        ...(attrsQuery && req.query ? req.query : {}),
+                        ...attrs,
+                    },
                 ),
+            );
+            res.send(
+                doc,
             ).end();
         } catch (e) {
             next(e);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mithril-express-middleware",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "express middleware for mithril.js projects",
   "main": "index.js",
   "scripts": {