@middy/http-content-negotiation 3.0.0-alpha.2 → 3.0.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +61 -32
  2. package/package.json +6 -5
package/index.js CHANGED
@@ -1,14 +1,16 @@
1
- import charset from 'negotiator/lib/charset.js';
2
- import encoding from 'negotiator/lib/encoding.js';
3
- import language from 'negotiator/lib/language.js';
4
- import mediaType from 'negotiator/lib/mediaType.js';
5
- import { createError } from '@middy/util';
1
+ import charset from 'negotiator/lib/charset.js'
2
+ import encoding from 'negotiator/lib/encoding.js'
3
+ import language from 'negotiator/lib/language.js'
4
+ import mediaType from 'negotiator/lib/mediaType.js'
5
+ import { createError } from '@middy/util'
6
+
6
7
  const parseFn = {
7
8
  Charset: charset,
8
9
  Encoding: encoding,
9
10
  Language: language,
10
11
  MediaType: mediaType
11
- };
12
+ }
13
+
12
14
  const defaults = {
13
15
  parseCharsets: true,
14
16
  availableCharsets: undefined,
@@ -19,51 +21,78 @@ const defaults = {
19
21
  parseMediaTypes: true,
20
22
  availableMediaTypes: undefined,
21
23
  failOnMismatch: true
22
- };
24
+ }
23
25
 
24
26
  const httpContentNegotiationMiddleware = (opts = {}) => {
25
- const options = { ...defaults,
26
- ...opts
27
- };
28
-
29
- const httpContentNegotiationMiddlewareBefore = async request => {
30
- const {
31
- event
32
- } = request;
33
- if (!event.headers) return;
27
+ const options = { ...defaults, ...opts }
34
28
 
29
+ const httpContentNegotiationMiddlewareBefore = async (request) => {
30
+ const { event } = request
31
+ if (!event.headers) return
35
32
  if (options.parseCharsets) {
36
- parseHeader('Accept-Charset', 'Charset', options.availableCharsets, options.failOnMismatch, event);
33
+ parseHeader(
34
+ 'Accept-Charset',
35
+ 'Charset',
36
+ options.availableCharsets,
37
+ options.failOnMismatch,
38
+ event
39
+ )
37
40
  }
38
41
 
39
42
  if (options.parseEncodings) {
40
- parseHeader('Accept-Encoding', 'Encoding', options.availableEncodings, options.failOnMismatch, event);
43
+ parseHeader(
44
+ 'Accept-Encoding',
45
+ 'Encoding',
46
+ options.availableEncodings,
47
+ options.failOnMismatch,
48
+ event
49
+ )
41
50
  }
42
51
 
43
52
  if (options.parseLanguages) {
44
- parseHeader('Accept-Language', 'Language', options.availableLanguages, options.failOnMismatch, event);
53
+ parseHeader(
54
+ 'Accept-Language',
55
+ 'Language',
56
+ options.availableLanguages,
57
+ options.failOnMismatch,
58
+ event
59
+ )
45
60
  }
46
61
 
47
62
  if (options.parseMediaTypes) {
48
- parseHeader('Accept', 'MediaType', options.availableMediaTypes, options.failOnMismatch, event);
63
+ parseHeader(
64
+ 'Accept',
65
+ 'MediaType',
66
+ options.availableMediaTypes,
67
+ options.failOnMismatch,
68
+ event
69
+ )
49
70
  }
50
- };
71
+ }
51
72
 
52
73
  return {
53
74
  before: httpContentNegotiationMiddlewareBefore
54
- };
55
- };
75
+ }
76
+ }
56
77
 
57
- const parseHeader = (headerName, type, availableValues, failOnMismatch, event) => {
58
- const resultsName = `preferred${type}s`;
59
- const resultName = `preferred${type}`;
60
- const headerValue = event.headers[headerName] ?? event.headers[headerName.toLowerCase()];
61
- event[resultsName] = parseFn[type](headerValue, availableValues);
62
- event[resultName] = event[resultsName][0];
78
+ const parseHeader = (
79
+ headerName,
80
+ type,
81
+ availableValues,
82
+ failOnMismatch,
83
+ event
84
+ ) => {
85
+ const resultsName = `preferred${type}s`
86
+ const resultName = `preferred${type}`
87
+ const headerValue =
88
+ event.headers[headerName] ?? event.headers[headerName.toLowerCase()]
89
+ event[resultsName] = parseFn[type](headerValue, availableValues)
90
+ event[resultName] = event[resultsName][0]
63
91
 
64
92
  if (failOnMismatch && event[resultName] === undefined) {
65
- throw createError(406, `Unsupported ${type}. Acceptable values: ${availableValues.join(', ')}`);
93
+ // NotAcceptable
94
+ throw createError(406, `Unsupported ${type}. Acceptable values: ${availableValues.join(', ')}`)
66
95
  }
67
- };
96
+ }
68
97
 
69
- export default httpContentNegotiationMiddleware;
98
+ export default httpContentNegotiationMiddleware
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@middy/http-content-negotiation",
3
- "version": "3.0.0-alpha.2",
3
+ "version": "3.0.0-alpha.3",
4
4
  "description": "Http content negotiation middleware for the middy framework",
5
5
  "type": "module",
6
6
  "engines": {
@@ -18,7 +18,8 @@
18
18
  ],
19
19
  "scripts": {
20
20
  "test": "npm run test:unit",
21
- "test:unit": "ava"
21
+ "test:unit": "ava",
22
+ "test:benchmark": "node __benchmarks__/index.js"
22
23
  },
23
24
  "license": "MIT",
24
25
  "keywords": [
@@ -47,11 +48,11 @@
47
48
  },
48
49
  "homepage": "https://github.com/middyjs/middy#readme",
49
50
  "dependencies": {
50
- "@middy/util": "^3.0.0-alpha.2",
51
+ "@middy/util": "^3.0.0-alpha.3",
51
52
  "negotiator": "0.6.2"
52
53
  },
53
54
  "devDependencies": {
54
- "@middy/core": "^3.0.0-alpha.2"
55
+ "@middy/core": "^3.0.0-alpha.3"
55
56
  },
56
- "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145"
57
+ "gitHead": "1441158711580313765e6d156046ef0fade0d156"
57
58
  }