add req.parsedBody and fix failing tests

Author: v1rtl

examples/mongodb/server.ts

@@ -1,15 +1,11 @@
-import { App, RHandler } from '../../mod.ts'
-import { Request } from '../../request.ts'
+import { App } from '../../mod.ts'
 import { MongoClient, Bson } from 'https://deno.land/x/mongo@v0.21.2/mod.ts'
 import * as dotenv from 'https://deno.land/x/tiny_env@1.0.0/mod.ts'
+import { json } from 'https://deno.land/x/parsec/mod.ts'
 
 dotenv.load()
 
-interface Req extends Request {
-  bodyResult: Record<string, unknown>
-}
-
-const app = new App<unknown, Req>()
+const app = new App()
 const port = parseInt(Deno.env.get('PORT') || '') || 3000
 
 // connect to mongodb
@@ -32,27 +28,12 @@ app.get('/notes', async (_, res, next) => {
   }
 })
 
-const bodyParser: RHandler<Req> = async (req, _res, next) => {
-  const buf = await Deno.readAll(req.body)
-
-  const dec = new TextDecoder()
-
-  const body = dec.decode(buf)
-
-  try {
-    const result = JSON.parse(body)
-    req.bodyResult = result
-  } catch (e) {
-    next(e)
-  }
-  next()
-}
-app.use(bodyParser)
+app.use(json)
 
 // add new note
 app.post('/notes', async (req, res, next) => {
   try {
-    const { title, desc } = req.bodyResult
+    const { title, desc } = req.parsedBody!
     await coll.insertOne({ title, desc })
 
     res.send(`Note with title of "${title}" has been added`)
@@ -64,7 +45,7 @@ app.post('/notes', async (req, res, next) => {
 // delete note
 app.delete('/notes', async (req, res, next) => {
   try {
-    const { id } = req.bodyResult
+    const { id } = req.parsedBody!
     await coll.deleteOne({ _id: new Bson.ObjectId(id) })
 
     res.send(`Note with id of ${id} has been deleted`)
@@ -76,7 +57,7 @@ app.delete('/notes', async (req, res, next) => {
 // update existing note
 app.put('/notes', async (req, res, next) => {
   try {
-    const { title, desc, id } = req.bodyResult
+    const { title, desc, id } = req.parsedBody!
     await coll.updateOne({ _id: new Bson.ObjectId(id) }, { $set: { title, desc } })
     res.send(`Note with title of ${title} has been updated`)
   } catch (err) {

examples/postgresql/server.ts

@@ -1,11 +1,8 @@
-import { App, RHandler, Request } from '../../mod.ts'
+import { App } from '../../mod.ts'
 import { Client } from 'https://deno.land/x/postgres@v0.8.0/mod.ts'
+import { json } from 'https://deno.land/x/parsec/mod.ts'
 
-interface Req extends Request {
-  bodyResult: Record<string, unknown>
-}
-
-const app = new App<unknown, Req>()
+const app = new App()
 const port = parseInt(Deno.env.get('PORT') || '', 10) || 3000
 
 const client = new Client({
@@ -16,29 +13,13 @@ const client = new Client({
 })
 await client.connect()
 
-const bodyParser: RHandler<Req> = async (req, _, next) => {
-  const buf = await Deno.readAll(req.body)
-
-  const dec = new TextDecoder()
-
-  const body = dec.decode(buf)
-
-  try {
-    const result = JSON.parse(body)
-    req.bodyResult = result
-  } catch (e) {
-    next(e)
-  }
-  next()
-}
-
 app.get('/notes', async (_, res) => {
   const query = await client.queryObject('SELECT * FROM NOTES', { fields: ['id', 'name'] })
   res.send(query.rows)
 })
 
-app.use(bodyParser).post('/notes', async (req, res) => {
-  const { title, desc } = req.bodyResult
+app.use(json).post('/notes', async (req, res) => {
+  const { title, desc } = req.parsedBody!
 
   const query = await client.queryObject(`INSERT INTO users(title, desc) VALUES (${title}, ${desc});`)
 

request.ts

@@ -35,4 +35,6 @@ export interface Request extends ServerRequest, tinyhttp.Request {
   connection: {
     remoteAddress: string
   }
+
+  parsedBody?: Record<string, unknown>
 }

tests/core/app.test.ts

@@ -51,14 +51,21 @@ describe('App constructor', () => {
 
 describe('Template engines', () => {
   it('Works with eta out of the box', async () => {
-    const app = new App<EtaConfig>()
+    const app = new App<EtaConfig>({
+      onError: (err) => console.log(err)
+    })
+
+    const pwd = Deno.cwd()
+
+    Deno.chdir(path.resolve(pwd, 'tests/fixtures'))
 
     app.engine('eta', eta)
 
     app.use((_, res) => {
       res.render('index.eta', {
         name: 'Eta'
       })
+      Deno.chdir(pwd)
     })
 
     const fetch = BindToSuperDeno(app)