@middy/validator 4.6.5 → 5.0.0-alpha.1

package/index.js

@@ -1,51 +1,75 @@
-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.event.preferredLanguage] ?? languages[defaultLanguage];
-                localize?.(eventSchema.errors);
-                // Bad Request
-                throw createError(400, 'Event object failed validation', {
-                    cause: eventSchema.errors
-                });
-            }
-        }
-        if (contextSchema) {
-            const validContext = await contextSchema(request.context);
-            if (!validContext) {
-                // Internal Server Error
-                throw createError(500, 'Context object failed validation', {
-                    cause: 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: 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
-    };
-};
-export default validatorMiddleware;
+      })
+    }
+  }
+  return {
+    before:
+      eventSchema ?? contextSchema ? validatorMiddlewareBefore : undefined,
+    after: responseSchema ? validatorMiddlewareAfter : undefined
+  }
+}
 
+export default validatorMiddleware

package/package.json

@@ -1,46 +1,35 @@
 {
   "name": "@middy/validator",
-  "version": "4.6.5",
+  "version": "5.0.0-alpha.1",
   "description": "Validator middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "./index.cjs",
   "module": "./index.js",
   "exports": {
     ".": {
       "import": {
         "types": "./index.d.ts",
         "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.cjs"
       }
     },
     "./transpile": {
       "import": {
         "types": "./transpile.d.ts",
         "default": "./transpile.js"
-      },
-      "require": {
-        "types": "./transpile.d.ts",
-        "default": "./transpile.cjs"
       }
     }
   },
   "types": "index.d.ts",
   "files": [
     "index.js",
-    "index.cjs",
     "index.d.ts",
     "transpile.js",
-    "transpile.cjs",
     "transpile.d.ts"
   ],
   "scripts": {
@@ -78,9 +67,8 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "4.6.5",
+    "@middy/util": "5.0.0-alpha.1",
     "ajv": "8.12.0",
-    "ajv-cmd": "0.3.4",
     "ajv-errors": "3.0.0",
     "ajv-formats": "2.1.1",
     "ajv-formats-draft2019": "1.6.1",
@@ -89,9 +77,10 @@
     "fast-uri": "2.2.0"
   },
   "devDependencies": {
-    "@middy/core": "4.6.5",
+    "@middy/core": "5.0.0-alpha.1",
     "@types/http-errors": "^2.0.0",
-    "ajv-bsontype": "^1.0.7"
+    "ajv-bsontype": "^1.0.7",
+    "ajv-cmd": "0.3.4"
   },
-  "gitHead": "573d7b0bb243d8c5a9bcb00cf29d031aa7a0c606"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/transpile.js

@@ -1,22 +1,25 @@
-import compileSchema from 'ajv-cmd/compile';
-import transpileFTL from 'ajv-cmd/ftl';
+/*
+import compileSchema from 'ajv-cmd/compile'
+import transpileFTL from 'ajv-cmd/ftl'
+
 const ajvDefaults = {
-    strict: true,
-    coerceTypes: 'array',
-    allErrors: true,
-    useDefaults: 'empty',
-    messages: true // needs to be true to allow multi-locale errorMessage to work
-};
+  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
+}
+
 // 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 transpileLocale = transpileFTL /*
+export const transpileSchema = (schema, ajvOptions) => {
+  const options = { ...ajvDefaults, ...ajvOptions }
+  return compileSchema(schema, options)
+}
+
+export const transpileLocale = transpileFTL
+*/
+
 import Ajv from 'ajv/dist/2020.js'
 import ajvFormats from 'ajv-formats'
 import ajvFormatsDraft2019 from 'ajv-formats-draft2019'
@@ -54,5 +57,17 @@ const compileSchema = (schema, options = {}) => {
 }
 // *** 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
+}
 
+// 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)
+}

package/index.cjs

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-const _util = require("@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.event.preferredLanguage] ?? languages[defaultLanguage];
-                localize?.(eventSchema.errors);
-                // Bad Request
-                throw (0, _util.createError)(400, 'Event object failed validation', {
-                    cause: eventSchema.errors
-                });
-            }
-        }
-        if (contextSchema) {
-            const validContext = await contextSchema(request.context);
-            if (!validContext) {
-                // Internal Server Error
-                throw (0, _util.createError)(500, 'Context object failed validation', {
-                    cause: contextSchema.errors
-                });
-            }
-        }
-    };
-    const validatorMiddlewareAfter = async (request)=>{
-        const validResponse = await responseSchema(request.response);
-        if (!validResponse) {
-            // Internal Server Error
-            throw (0, _util.createError)(500, 'Response object failed validation', {
-                cause: responseSchema.errors
-            });
-        }
-    };
-    return {
-        before: eventSchema ?? contextSchema ? validatorMiddlewareBefore : undefined,
-        after: responseSchema ? validatorMiddlewareAfter : undefined
-    };
-};
-const _default = validatorMiddleware;
-

package/transpile.cjs

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    transpileLocale: function() {
-        return transpileLocale;
-    },
-    transpileSchema: function() {
-        return transpileSchema;
-    }
-});
-const _compile = /*#__PURE__*/ _interop_require_default(require("ajv-cmd/compile"));
-const _ftl = /*#__PURE__*/ _interop_require_default(require("ajv-cmd/ftl"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const ajvDefaults = {
-    strict: true,
-    coerceTypes: 'array',
-    allErrors: true,
-    useDefaults: 'empty',
-    messages: true // needs to be true to allow multi-locale errorMessage to work
-};
-const transpileSchema = (schema, ajvOptions)=>{
-    const options = {
-        ...ajvDefaults,
-        ...ajvOptions
-    };
-    return (0, _compile.default)(schema, options);
-};
-const transpileLocale = _ftl /*
-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
-
-// *** 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)
-}
-// *** End `ajv-cmd/compile` *** //
-
-*/ .default;
-