@middy/validator 2.5.5 → 2.5.6

package/index.js

@@ -1,29 +1,20 @@
-"use strict";
+const { createError } = require('@middy/util')
+const _ajv = require('ajv/dist/2019')
+const localize = require('ajv-i18n')
+const formats = require('ajv-formats')
+const formatsDraft2019 = require('ajv-formats-draft2019')
 
-const {
-  createError
-} = require('@middy/util');
+const Ajv = _ajv.default // esm workaround for linting
 
-const _ajv = require('ajv/dist/2019');
-
-const localize = require('ajv-i18n');
-
-const formats = require('ajv-formats');
-
-const formatsDraft2019 = require('ajv-formats-draft2019');
-
-const Ajv = _ajv.default; // esm workaround for linting
-
-let ajv;
+let ajv
 const ajvDefaults = {
   strict: true,
-  coerceTypes: 'array',
-  // important for query string params
+  coerceTypes: 'array', // important for query string params
   allErrors: true,
   useDefaults: 'empty',
   messages: false // allow i18n
+}
 
-};
 const defaults = {
   inputSchema: undefined,
   outputSchema: undefined,
@@ -31,7 +22,7 @@ const defaults = {
   ajvInstance: undefined,
   defaultLanguage: 'en',
   i18nEnabled: true
-};
+}
 
 const validatorMiddleware = (opts = {}) => {
   let {
@@ -41,74 +32,63 @@ 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) {
       // Bad Request
-      const error = createError(400, 'Event object failed validation');
-      request.event.headers = { ...request.event.headers
-      };
+      const error = createError(400, 'Event object failed validation')
+      request.event.headers = { ...request.event.headers }
 
       if (i18nEnabled) {
-        const language = chooseLanguage(request.event, defaultLanguage);
-        localize[language](inputSchema.errors);
+        const language = chooseLanguage(request.event, defaultLanguage)
+        localize[language](inputSchema.errors)
       }
 
-      error.details = inputSchema.errors;
-      throw error;
+      error.details = inputSchema.errors
+      throw error
     }
-  };
+  }
 
-  const validatorMiddlewareAfter = async request => {
-    const valid = outputSchema(request.response);
+  const validatorMiddlewareAfter = async (request) => {
+    const valid = outputSchema(request.response)
 
     if (!valid) {
       // Internal Server Error
-      const error = createError(500, 'Response object failed validation');
-      error.details = outputSchema.errors;
-      error.response = request.response;
-      throw error;
+      const error = createError(500, 'Response object failed validation')
+      error.details = outputSchema.errors
+      error.response = request.response
+      throw error
     }
-  };
-
+  }
   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.
-
+  }
+}
 
+// 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 !== null && ajvInstance !== void 0 ? 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)
+}
 
-  return ajv.compile(schema);
-};
 /* in ajv-i18n Portuguese is represented as pt-BR */
-
-
 const languageNormalizationMap = {
   pt: 'pt-BR',
   'pt-br': 'pt-BR',
@@ -117,28 +97,21 @@ const languageNormalizationMap = {
   'zh-tw': 'zh-TW',
   zh_TW: 'zh-TW',
   zh_tw: 'zh-TW'
-};
-
-const normalizePreferredLanguage = lang => {
-  var _languageNormalizatio;
+}
 
-  return (_languageNormalizatio = languageNormalizationMap[lang]) !== null && _languageNormalizatio !== void 0 ? _languageNormalizatio : 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
+}
 
-module.exports = validatorMiddleware;
+module.exports = validatorMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Validator middleware for the middy framework",
   "type": "commonjs",
   "engines": {
@@ -45,17 +45,16 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.5",
+    "@middy/util": "^2.5.6",
     "ajv": "8.6.3",
     "ajv-formats": "2.1.1",
     "ajv-formats-draft2019": "1.6.1",
     "ajv-i18n": "4.1.0"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.5",
+    "@middy/core": "^2.5.6",
     "@types/http-errors": "^1.8.1",
-    "ajv-bsontype": "^1.0.7",
-    "http-errors": "^1.8.0"
+    "ajv-bsontype": "^1.0.7"
   },
-  "gitHead": "b84840ec8afd289f6decfd0d645be4899051792d"
+  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
 }