@middy/validator 5.0.0-alpha.1 → 5.0.0-rc.0

package/index.js

@@ -1,75 +1,60 @@
-import { createError } from '@middy/util'
-
+import { createError } from '@middy/util';
 const defaults = {
-  eventSchema: undefined,
-  contextSchema: undefined,
-  responseSchema: undefined,
-  defaultLanguage: 'en',
-  languages: {}
-}
-
-const validatorMiddleware = (opts = {}) => {
-  const {
-    eventSchema,
-    contextSchema,
-    responseSchema,
-    defaultLanguage,
-    languages
-  } = { ...defaults, ...opts }
-
-  const validatorMiddlewareBefore = async (request) => {
-    if (eventSchema) {
-      const validEvent = await eventSchema(request.event)
-
-      if (!validEvent) {
-        const localize =
-          languages[request.context.preferredLanguage] ??
-          languages[defaultLanguage]
-        localize?.(eventSchema.errors)
-
-        // Bad Request
-        throw createError(400, 'Event object failed validation', {
-          cause: {
-            pacakge: '@middy/validator',
-            data: eventSchema.errors
-          }
-        })
-      }
-    }
-
-    if (contextSchema) {
-      const validContext = await contextSchema(request.context)
-
-      if (!validContext) {
-        // Internal Server Error
-        throw createError(500, 'Context object failed validation', {
-          cause: {
-            package: '@middy/validator',
-            data: contextSchema.errors
-          }
-        })
-      }
-    }
-  }
-
-  const validatorMiddlewareAfter = async (request) => {
-    const validResponse = await responseSchema(request.response)
-
-    if (!validResponse) {
-      // Internal Server Error
-      throw createError(500, 'Response object failed validation', {
-        cause: {
-          package: '@middy/validator',
-          data: responseSchema.errors
+    eventSchema: undefined,
+    contextSchema: undefined,
+    responseSchema: undefined,
+    defaultLanguage: 'en',
+    languages: {}
+};
+const validatorMiddleware = (opts = {})=>{
+    const { eventSchema, contextSchema, responseSchema, defaultLanguage, languages } = {
+        ...defaults,
+        ...opts
+    };
+    const validatorMiddlewareBefore = async (request)=>{
+        if (eventSchema) {
+            const validEvent = await eventSchema(request.event);
+            if (!validEvent) {
+                const localize = languages[request.context.preferredLanguage] ?? languages[defaultLanguage];
+                localize?.(eventSchema.errors);
+                // Bad Request
+                throw createError(400, 'Event object failed validation', {
+                    cause: {
+                        pacakge: '@middy/validator',
+                        data: eventSchema.errors
+                    }
+                });
+            }
+        }
+        if (contextSchema) {
+            const validContext = await contextSchema(request.context);
+            if (!validContext) {
+                // Internal Server Error
+                throw createError(500, 'Context object failed validation', {
+                    cause: {
+                        package: '@middy/validator',
+                        data: contextSchema.errors
+                    }
+                });
+            }
+        }
+    };
+    const validatorMiddlewareAfter = async (request)=>{
+        const validResponse = await responseSchema(request.response);
+        if (!validResponse) {
+            // Internal Server Error
+            throw createError(500, 'Response object failed validation', {
+                cause: {
+                    package: '@middy/validator',
+                    data: responseSchema.errors
+                }
+            });
         }
-      })
-    }
-  }
-  return {
-    before:
-      eventSchema ?? contextSchema ? validatorMiddlewareBefore : undefined,
-    after: responseSchema ? validatorMiddlewareAfter : undefined
-  }
-}
+    };
+    return {
+        before: eventSchema ?? contextSchema ? validatorMiddlewareBefore : undefined,
+        after: responseSchema ? validatorMiddlewareAfter : undefined
+    };
+};
+export default validatorMiddleware;
 
-export default validatorMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-rc.0",
   "description": "Validator middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -67,20 +67,20 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.0-alpha.1",
+    "@middy/util": "5.0.0-rc.0",
     "ajv": "8.12.0",
     "ajv-errors": "3.0.0",
     "ajv-formats": "2.1.1",
     "ajv-formats-draft2019": "1.6.1",
     "ajv-ftl-i18n": "0.1.1",
     "ajv-keywords": "5.1.0",
-    "fast-uri": "2.2.0"
+    "fast-uri": "2.3.0"
   },
   "devDependencies": {
-    "@middy/core": "5.0.0-alpha.1",
+    "@middy/core": "5.0.0-rc.0",
     "@types/http-errors": "^2.0.0",
     "ajv-bsontype": "^1.0.7",
     "ajv-cmd": "0.3.4"
   },
-  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
+  "gitHead": "403c54ba9f05e038d1ee7541f9e4a7a6d46e9916"
 }

package/transpile.js

@@ -18,56 +18,57 @@ export const transpileSchema = (schema, ajvOptions) => {
 }
 
 export const transpileLocale = transpileFTL
-*/
-
-import Ajv from 'ajv/dist/2020.js'
-import ajvFormats from 'ajv-formats'
-import ajvFormatsDraft2019 from 'ajv-formats-draft2019'
-import ajvKeywords from 'ajv-keywords'
-import ajvErrors from 'ajv-errors'
-import uriResolver from 'fast-uri'
-
-import { transpile } from 'ajv-ftl-i18n'
-
+*/ import Ajv from 'ajv/dist/2020.js';
+import ajvFormats from 'ajv-formats';
+import ajvFormatsDraft2019 from 'ajv-formats-draft2019';
+import ajvKeywords from 'ajv-keywords';
+import ajvErrors from 'ajv-errors';
+import uriResolver from 'fast-uri';
+import { transpile } from 'ajv-ftl-i18n';
 // import transpileFTL from 'ajv-cmd/ftl'
-export const transpileFTL = transpile
-
+export const transpileFTL = transpile;
 // *** Start `ajv-cmd/compile` *** //
 // import compileSchema from 'ajv-cmd/compile'
-
 const defaultOptions = {
-  uriResolver // faster than default
-}
-
-const instance = (options = {}) => {
-  options = { ...defaultOptions, ...options, keywords: [] }
-
-  const ajv = new Ajv(options)
-  ajvFormats(ajv)
-  ajvFormatsDraft2019(ajv)
-  ajvKeywords(ajv)
-  ajvErrors(ajv)
-  return ajv
-}
-
-const compileSchema = (schema, options = {}) => {
-  options = { ...defaultOptions, ...options, keywords: [] }
-  const ajv = instance(options)
-  return ajv.compile(schema)
-}
+    uriResolver
+};
+const instance = (options = {})=>{
+    options = {
+        ...defaultOptions,
+        ...options,
+        keywords: []
+    };
+    const ajv = new Ajv(options);
+    ajvFormats(ajv);
+    ajvFormatsDraft2019(ajv);
+    ajvKeywords(ajv);
+    ajvErrors(ajv);
+    return ajv;
+};
+const compileSchema = (schema, options = {})=>{
+    options = {
+        ...defaultOptions,
+        ...options,
+        keywords: []
+    };
+    const ajv = instance(options);
+    return ajv.compile(schema);
+};
 // *** End `ajv-cmd/compile` *** //
-
 const ajvDefaults = {
-  strict: true,
-  coerceTypes: 'array', // important for query string params
-  allErrors: true,
-  useDefaults: 'empty',
-  messages: true // needs to be true to allow multi-locale errorMessage to work
-}
-
+    strict: true,
+    coerceTypes: 'array',
+    allErrors: true,
+    useDefaults: 'empty',
+    messages: true // needs to be true to allow multi-locale errorMessage to work
+};
 // This is pulled out due to it's performance cost (50-100ms on cold start)
 // Precompile your schema during a build step is recommended.
-export const transpileSchema = (schema, ajvOptions) => {
-  const options = { ...ajvDefaults, ...ajvOptions }
-  return compileSchema(schema, options)
-}
+export const transpileSchema = (schema, ajvOptions)=>{
+    const options = {
+        ...ajvDefaults,
+        ...ajvOptions
+    };
+    return compileSchema(schema, options);
+};
+