@middy/validator 3.0.0-alpha.3 → 3.0.0-alpha.4

package/index.js

@@ -1,20 +1,17 @@
-import { createError } from '@middy/util'
-import _ajv from 'ajv/dist/2019.js'
-import localize from 'ajv-i18n'
-import formats from 'ajv-formats'
-import formatsDraft2019 from 'ajv-formats-draft2019'
-
-const Ajv = _ajv.default // esm workaround for linting
-
-let ajv
+import { createError } from '@middy/util';
+import _ajv from 'ajv/dist/2019.js';
+import localize from 'ajv-i18n';
+import formats from 'ajv-formats';
+import formatsDraft2019 from 'ajv-formats-draft2019';
+const Ajv = _ajv.default;
+let ajv;
 const ajvDefaults = {
   strict: true,
-  coerceTypes: 'array', // important for query string params
+  coerceTypes: 'array',
   allErrors: true,
   useDefaults: 'empty',
-  messages: false // allow i18n
-}
-
+  messages: false
+};
 const defaults = {
   inputSchema: undefined,
   outputSchema: undefined,
@@ -22,7 +19,7 @@ const defaults = {
   ajvInstance: undefined,
   defaultLanguage: 'en',
   i18nEnabled: true
-}
+};
 
 const validatorMiddleware = (opts = {}) => {
   let {
@@ -32,56 +29,62 @@ const validatorMiddleware = (opts = {}) => {
     ajvInstance,
     defaultLanguage,
     i18nEnabled
-  } = { ...defaults, ...opts }
-  inputSchema = compile(inputSchema, ajvOptions, ajvInstance)
-  outputSchema = compile(outputSchema, ajvOptions, ajvInstance)
+  } = { ...defaults,
+    ...opts
+  };
+  inputSchema = compile(inputSchema, ajvOptions, ajvInstance);
+  outputSchema = compile(outputSchema, ajvOptions, ajvInstance);
 
-  const validatorMiddlewareBefore = async (request) => {
-    const valid = inputSchema(request.event)
+  const validatorMiddlewareBefore = async request => {
+    const valid = inputSchema(request.event);
 
     if (!valid) {
       if (i18nEnabled) {
-        const language = chooseLanguage(request.event, defaultLanguage)
-        localize[language](inputSchema.errors)
+        const language = chooseLanguage(request.event, defaultLanguage);
+        localize[language](inputSchema.errors);
       }
 
-      // Bad Request
-      throw createError(400, 'Event object failed validation', { cause: inputSchema.errors })
+      throw createError(400, 'Event object failed validation', {
+        cause: inputSchema.errors
+      });
     }
-  }
+  };
 
-  const validatorMiddlewareAfter = async (request) => {
-    const valid = outputSchema(request.response)
+  const validatorMiddlewareAfter = async request => {
+    const valid = outputSchema(request.response);
 
     if (!valid) {
-      // Internal Server Error
-      throw createError(500, 'Response object failed validation', { cause: outputSchema.errors })
+      throw createError(500, 'Response object failed validation', {
+        cause: outputSchema.errors
+      });
     }
-  }
+  };
+
   return {
     before: inputSchema ? validatorMiddlewareBefore : undefined,
     after: outputSchema ? validatorMiddlewareAfter : undefined
-  }
-}
+  };
+};
 
-// This is pulled out due to it's performance cost (50-100ms on cold start)
-// Precompile your schema during a build step is recommended.
 const compile = (schema, ajvOptions, ajvInstance = null) => {
-  // Check if already compiled
-  if (typeof schema === 'function' || !schema) return schema
-  const options = { ...ajvDefaults, ...ajvOptions }
+  if (typeof schema === 'function' || !schema) return schema;
+  const options = { ...ajvDefaults,
+    ...ajvOptions
+  };
+
   if (!ajv) {
-    ajv = ajvInstance ?? new Ajv(options)
-    formats(ajv)
-    formatsDraft2019(ajv)
+    ajv = ajvInstance ?? new Ajv(options);
+    formats(ajv);
+    formatsDraft2019(ajv);
   } else if (!ajvInstance) {
-    // Update options when initializing the middleware multiple times
-    ajv.opts = { ...ajv.opts, ...options }
+    ajv.opts = { ...ajv.opts,
+      ...options
+    };
   }
-  return ajv.compile(schema)
-}
 
-/* in ajv-i18n Portuguese is represented as pt-BR */
+  return ajv.compile(schema);
+};
+
 const languageNormalizationMap = {
   pt: 'pt-BR',
   'pt-br': 'pt-BR',
@@ -90,21 +93,24 @@ const languageNormalizationMap = {
   'zh-tw': 'zh-TW',
   zh_TW: 'zh-TW',
   zh_tw: 'zh-TW'
-}
+};
 
-const normalizePreferredLanguage = (lang) =>
-  languageNormalizationMap[lang] ?? lang
+const normalizePreferredLanguage = lang => languageNormalizationMap[lang] ?? lang;
 
-const availableLanguages = Object.keys(localize)
-const chooseLanguage = ({ preferredLanguage }, defaultLanguage) => {
+const availableLanguages = Object.keys(localize);
+
+const chooseLanguage = ({
+  preferredLanguage
+}, defaultLanguage) => {
   if (preferredLanguage) {
-    const lang = normalizePreferredLanguage(preferredLanguage)
+    const lang = normalizePreferredLanguage(preferredLanguage);
+
     if (availableLanguages.includes(lang)) {
-      return lang
+      return lang;
     }
   }
 
-  return defaultLanguage
-}
+  return defaultLanguage;
+};
 
-export default validatorMiddleware
+export default validatorMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "description": "Validator middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -47,16 +47,16 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^3.0.0-alpha.3",
+    "@middy/util": "^3.0.0-alpha.4",
     "ajv": "8.8.2",
     "ajv-formats": "2.1.1",
     "ajv-formats-draft2019": "1.6.1",
     "ajv-i18n": "4.2.0"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.3",
+    "@middy/core": "^3.0.0-alpha.4",
     "@types/http-errors": "^1.8.1",
     "ajv-bsontype": "^1.0.7"
   },
-  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
+  "gitHead": "d4bea7f4e21f6a9bbb1f6f6908361169598b9e53"
 }