@middy/validator 4.0.0-alpha.2 → 4.0.0-alpha.4

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 (3) hide show
  1. package/index.cjs +3 -25
  2. package/index.js +3 -20
  3. package/package.json +4 -4
package/index.cjs CHANGED
@@ -7,22 +7,15 @@ Object.defineProperty(module, "exports", {
7
7
  get: ()=>_default
8
8
  });
9
9
  const _util = require("@middy/util");
10
- const _ajvFtlI18N = _interopRequireDefault(require("ajv-ftl-i18n"));
11
- function _interopRequireDefault(obj) {
12
- return obj && obj.__esModule ? obj : {
13
- default: obj
14
- };
15
- }
16
10
  const defaults = {
17
11
  eventSchema: undefined,
18
12
  contextSchema: undefined,
19
13
  responseSchema: undefined,
20
- i18nEnabled: true,
21
14
  defaultLanguage: 'en',
22
15
  languages: {}
23
16
  };
24
17
  const validatorMiddleware = (opts = {})=>{
25
- const { eventSchema , contextSchema , responseSchema , i18nEnabled , defaultLanguage , languages } = {
18
+ const { eventSchema , contextSchema , responseSchema , defaultLanguage , languages } = {
26
19
  ...defaults,
27
20
  ...opts
28
21
  };
@@ -30,14 +23,8 @@ const validatorMiddleware = (opts = {})=>{
30
23
  if (eventSchema) {
31
24
  const validEvent = await eventSchema(request.event);
32
25
  if (!validEvent) {
33
- if (i18nEnabled) {
34
- const language = chooseLanguage(request.event, defaultLanguage);
35
- if (languages[language]) {
36
- languages[language](eventSchema.errors);
37
- } else {
38
- _ajvFtlI18N.default[language](eventSchema.errors);
39
- }
40
- }
26
+ const localize = languages[request.event.preferredLanguage] ?? languages[defaultLanguage];
27
+ localize?.(eventSchema.errors);
41
28
  throw (0, _util.createError)(400, 'Event object failed validation', {
42
29
  cause: eventSchema.errors
43
30
  });
@@ -65,15 +52,6 @@ const validatorMiddleware = (opts = {})=>{
65
52
  after: responseSchema ? validatorMiddlewareAfter : undefined
66
53
  };
67
54
  };
68
- const availableLanguages = Object.keys(_ajvFtlI18N.default);
69
- const chooseLanguage = ({ preferredLanguage }, defaultLanguage)=>{
70
- if (preferredLanguage) {
71
- if (availableLanguages.includes(preferredLanguage)) {
72
- return preferredLanguage;
73
- }
74
- }
75
- return defaultLanguage;
76
- };
77
55
  const _default = validatorMiddleware;
78
56
 
79
57
 
package/index.js CHANGED
@@ -1,15 +1,13 @@
1
1
  import { createError } from '@middy/util';
2
- import localize from 'ajv-ftl-i18n';
3
2
  const defaults = {
4
3
  eventSchema: undefined,
5
4
  contextSchema: undefined,
6
5
  responseSchema: undefined,
7
- i18nEnabled: true,
8
6
  defaultLanguage: 'en',
9
7
  languages: {}
10
8
  };
11
9
  const validatorMiddleware = (opts = {})=>{
12
- const { eventSchema , contextSchema , responseSchema , i18nEnabled , defaultLanguage , languages } = {
10
+ const { eventSchema , contextSchema , responseSchema , defaultLanguage , languages } = {
13
11
  ...defaults,
14
12
  ...opts
15
13
  };
@@ -17,14 +15,8 @@ const validatorMiddleware = (opts = {})=>{
17
15
  if (eventSchema) {
18
16
  const validEvent = await eventSchema(request.event);
19
17
  if (!validEvent) {
20
- if (i18nEnabled) {
21
- const language = chooseLanguage(request.event, defaultLanguage);
22
- if (languages[language]) {
23
- languages[language](eventSchema.errors);
24
- } else {
25
- localize[language](eventSchema.errors);
26
- }
27
- }
18
+ const localize = languages[request.event.preferredLanguage] ?? languages[defaultLanguage];
19
+ localize?.(eventSchema.errors);
28
20
  throw createError(400, 'Event object failed validation', {
29
21
  cause: eventSchema.errors
30
22
  });
@@ -52,15 +44,6 @@ const validatorMiddleware = (opts = {})=>{
52
44
  after: responseSchema ? validatorMiddlewareAfter : undefined
53
45
  };
54
46
  };
55
- const availableLanguages = Object.keys(localize);
56
- const chooseLanguage = ({ preferredLanguage }, defaultLanguage)=>{
57
- if (preferredLanguage) {
58
- if (availableLanguages.includes(preferredLanguage)) {
59
- return preferredLanguage;
60
- }
61
- }
62
- return defaultLanguage;
63
- };
64
47
  export default validatorMiddleware;
65
48
 
66
49
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@middy/validator",
3
- "version": "4.0.0-alpha.2",
3
+ "version": "4.0.0-alpha.4",
4
4
  "description": "Validator middleware for the middy framework",
5
5
  "type": "module",
6
6
  "engines": {
@@ -73,13 +73,13 @@
73
73
  },
74
74
  "homepage": "https://middy.js.org",
75
75
  "dependencies": {
76
- "@middy/util": "4.0.0-alpha.2",
76
+ "@middy/util": "4.0.0-alpha.4",
77
77
  "ajv-cmd": "0.1.10"
78
78
  },
79
79
  "devDependencies": {
80
- "@middy/core": "4.0.0-alpha.2",
80
+ "@middy/core": "4.0.0-alpha.4",
81
81
  "@types/http-errors": "^1.8.1",
82
82
  "ajv-bsontype": "^1.0.7"
83
83
  },
84
- "gitHead": "c1e1b7af571a2bb14092ee2cb6e0b716828fbd2f"
84
+ "gitHead": "cbf2af8e31dab58ed28d26143cd77cca544657ae"
85
85
  }