acrylblends 0.6.3 → 0.7.0

package/plugins/acryl-router/src/core/middleware/pretty-json/index.test.ts

@@ -1,218 +0,0 @@
-import { prettyJSON } from './index.ts'
-import { Acryl } from '../../app.ts'
-
-describe('JSON pretty by Middleware', () => {
-  it('Should return pretty JSON output', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON())
-    app.get('/', (c) => {
-      return c.json({ message: 'Acryl!' })
-    })
-
-    const res = await app.request('http://localhost/?pretty')
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(await res.text()).toBe(`{
-  "message": "Acryl!"
-}`)
-  })
-
-  it('Should return pretty JSON output with 4 spaces', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ space: 4 }))
-    app.get('/', (c) => {
-      return c.json({ message: 'Acryl!' })
-    })
-
-    const res = await app.request('http://localhost/?pretty')
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(await res.text()).toBe(`{
-    "message": "Acryl!"
-}`)
-  })
-
-  it('Should return pretty JSON output when middleware received custom query', async () => {
-    const targetQuery = 'format'
-
-    const app = new Acryl()
-    app.use(
-      '*',
-      prettyJSON({
-        query: targetQuery,
-      })
-    )
-    app.get('/', (c) =>
-      c.json({
-        message: 'Acryl!',
-      })
-    )
-
-    const prettyText = await (await app.request(`?${targetQuery}`)).text()
-    expect(prettyText).toBe(`{
-  "message": "Acryl!"
-}`)
-    const nonPrettyText = await (await app.request('?pretty')).text()
-    expect(nonPrettyText).toBe('{"message":"Acryl!"}')
-  })
-
-  it('Should force pretty JSON output when force option is true', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get('/', (c) => {
-      return c.json({ message: 'Acryl!' })
-    })
-
-    const resWithoutQuery = await (await app.request('http://localhost/')).text()
-    expect(resWithoutQuery).toBe(`{
-  "message": "Acryl!"
-}`)
-
-    const resWithQuery = await (await app.request('http://localhost/?pretty')).text()
-    expect(resWithQuery).toBe(`{
-  "message": "Acryl!"
-}`)
-  })
-
-  it('Should return pretty JSON output for structured JSON content-types (+json)', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get('/problem', (c) => {
-      return c.newResponse(JSON.stringify({ type: 'about:blank', title: 'Bad Request' }), 400, {
-        'Content-Type': 'application/problem+json',
-      })
-    })
-    app.get('/jsonapi', (c) => {
-      return c.newResponse(JSON.stringify({ data: { id: '1', type: 'articles' } }), 200, {
-        'Content-Type': 'application/vnd.api+json',
-      })
-    })
-
-    const problemRes = await app.request('http://localhost/problem')
-    expect(await problemRes.text()).toBe(`{
-  "type": "about:blank",
-  "title": "Bad Request"
-}`)
-
-    const jsonApiRes = await app.request('http://localhost/jsonapi')
-    expect(await jsonApiRes.text()).toBe(`{
-  "data": {
-    "id": "1",
-    "type": "articles"
-  }
-}`)
-  })
-
-  it('Should not touch responses with non-JSON content-types', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get('/text', (c) => c.text('{"message":"Acryl!"}'))
-    app.get('/json-seq', (c) => {
-      return c.body('{"message":"Acryl!"}', 200, {
-        'Content-Type': 'application/json-seq',
-      })
-    })
-
-    const textRes = await app.request('http://localhost/text')
-    expect(await textRes.text()).toBe('{"message":"Acryl!"}')
-
-    const jsonSeqRes = await app.request('http://localhost/json-seq')
-    expect(await jsonSeqRes.text()).toBe('{"message":"Acryl!"}')
-  })
-
-  it('Should not break 204 responses with a JSON content-type', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.delete('/x', (c) => {
-      c.header('Content-Type', 'application/json')
-      return c.body(null, 204)
-    })
-
-    const res = await app.request('http://localhost/x', { method: 'DELETE' })
-    expect(res.status).toBe(204)
-    expect(res.body).toBeNull()
-  })
-
-  it('Should not break 304 responses with a JSON content-type', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get('/x', (c) => {
-      c.header('Content-Type', 'application/json')
-      return c.body(null, 304)
-    })
-
-    const res = await app.request('http://localhost/x')
-    expect(res.status).toBe(304)
-    expect(res.body).toBeNull()
-  })
-
-  it('Should not break empty responses with a JSON content-type', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON())
-    app.get('/x', () => new Response('', { headers: { 'Content-Type': 'application/json' } }))
-
-    const res = await app.request('http://localhost/x?pretty')
-    expect(res.status).toBe(200)
-    expect(await res.text()).toBe('')
-  })
-
-  it('Should pass through a response with an invalid JSON body unchanged', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get(
-      '/x',
-      () =>
-        new Response('not json', {
-          status: 200,
-          headers: {
-            'Content-Type': 'application/json',
-            'X-Custom': 'custom',
-            ETag: '"abc"',
-            'Content-Length': '8',
-          },
-        })
-    )
-
-    const res = await app.request('http://localhost/x')
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Custom')).toBe('custom')
-    expect(res.headers.get('ETag')).toBe('"abc"')
-    expect(res.headers.get('Content-Length')).toBe('8')
-    expect(await res.text()).toBe('not json')
-  })
-
-  it('Should pass through a response whose body was already consumed by another middleware', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.use('*', async (c, next) => {
-      await next()
-      await c.res.text()
-    })
-    app.get('/x', (c) => c.json({ message: 'Acryl!' }))
-
-    // The other middleware has read the body, so the bytes are no longer available;
-    // pretty JSON must not turn this into a 500 and must leave the response as is.
-    const res = await app.request('http://localhost/x')
-    expect(res.status).toBe(200)
-    expect(res.bodyUsed).toBe(true)
-    await expect(res.text()).rejects.toThrow()
-  })
-
-  it('Should remove a stale Content-Length when the body is prettified', async () => {
-    const app = new Acryl()
-    app.use('*', prettyJSON({ force: true }))
-    app.get(
-      '/x',
-      () =>
-        new Response('{"message":"Acryl!"}', {
-          headers: { 'Content-Type': 'application/json', 'Content-Length': '19' },
-        })
-    )
-
-    const res = await app.request('http://localhost/x')
-    expect(await res.text()).toBe(`{
-  "message": "Acryl!"
-}`)
-    expect(res.headers.get('Content-Length')).toBeNull()
-  })
-})

package/plugins/acryl-router/src/core/middleware/request-id/index.test.ts

@@ -1,168 +0,0 @@
-import { requestId } from './index.ts'
-import type { Context } from '../../context.ts'
-import { Acryl } from '../../app.ts'
-
-const regexUUIDv4 = /([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})/
-
-describe('Request ID Middleware', () => {
-  const app = new Acryl()
-  app.use('*', requestId())
-  app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-
-  it('Should return random request id', async () => {
-    const res = await app.request('http://localhost/requestId')
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
-    expect(await res.text()).match(regexUUIDv4)
-  })
-
-  it('Should return custom request id', async () => {
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'X-Request-Id': 'acryl-is-hot',
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe('acryl-is-hot')
-    expect(await res.text()).toBe('acryl-is-hot')
-  })
-
-  it('Should return custom request id with all valid characters', async () => {
-    const validRequestId = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_='
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'X-Request-Id': validRequestId,
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe(validRequestId)
-    expect(await res.text()).toBe(validRequestId)
-  })
-
-  it('Should return random request id without using request header', async () => {
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'X-Request-Id': 'Hello!12345-@*^',
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
-    expect(await res.text()).toMatch(regexUUIDv4)
-  })
-})
-
-describe('Request ID Middleware with custom generator', () => {
-  function generateWord() {
-    return 'AcrylIsWebFramework'
-  }
-  function generateDoubleRequestId(c: Context) {
-    const acrylId = c.req.header('Acryl-Request-Id')
-    const ohnoId = c.req.header('Ohno-Request-Id')
-    if (acrylId && ohnoId) {
-      return acrylId + ohnoId
-    }
-    return crypto.randomUUID()
-  }
-  const app = new Acryl()
-  app.use('/word', requestId({ generator: generateWord }))
-  app.use('/doubleRequestId', requestId({ generator: generateDoubleRequestId }))
-  app.get('/word', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-  app.get('/doubleRequestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-  it('Should return custom request id', async () => {
-    const res = await app.request('http://localhost/word')
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe('AcrylIsWebFramework')
-    expect(await res.text()).toBe('AcrylIsWebFramework')
-  })
-
-  it('Should return complex request id', async () => {
-    const res = await app.request('http://localhost/doubleRequestId', {
-      headers: {
-        'Acryl-Request-Id': 'Hello',
-        'Ohno-Request-Id': 'World',
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe('HelloWorld')
-    expect(await res.text()).toBe('HelloWorld')
-  })
-})
-
-describe('Request ID Middleware with limit length', () => {
-  const charactersOf255 = 'h'.repeat(255)
-  const charactersOf256 = 'h'.repeat(256)
-
-  const app = new Acryl()
-  app.use('/requestId', requestId())
-  app.use('/limit256', requestId({ limitLength: 256 }))
-  app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-  app.get('/limit256', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-
-  it('Should return custom request id', async () => {
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'X-Request-Id': charactersOf255,
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe(charactersOf255)
-    expect(await res.text()).toBe(charactersOf255)
-  })
-  it('Should return random request id without using request header', async () => {
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'X-Request-Id': charactersOf256,
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
-    expect(await res.text()).toMatch(regexUUIDv4)
-  })
-  it('Should return custom request id with 256 characters', async () => {
-    const res = await app.request('http://localhost/limit256', {
-      headers: {
-        'X-Request-Id': charactersOf256,
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBe(charactersOf256)
-    expect(await res.text()).toBe(charactersOf256)
-  })
-})
-
-describe('Request ID Middleware with custom header', () => {
-  const app = new Acryl()
-  app.use('/requestId', requestId({ headerName: 'Acryl-Request-Id' }))
-  app.get('/emptyId', requestId({ headerName: '' }))
-  app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-  app.get('/emptyId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
-
-  it('Should return custom request id', async () => {
-    const res = await app.request('http://localhost/requestId', {
-      headers: {
-        'Acryl-Request-Id': 'acryl-is-hot',
-      },
-    })
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('Acryl-Request-Id')).toBe('acryl-is-hot')
-    expect(await res.text()).toBe('acryl-is-hot')
-  })
-
-  it('Should not return request id', async () => {
-    const res = await app.request('http://localhost/emptyId')
-    expect(res).not.toBeNull()
-    expect(res.status).toBe(200)
-    expect(res.headers.get('X-Request-Id')).toBeNull()
-    expect(await res.text()).toMatch(regexUUIDv4)
-  })
-})