@middy/validator 4.0.0-alpha.1 → 4.0.0-alpha.3

package/index.cjs

@@ -2,35 +2,20 @@
 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, {
-    transpileSchema: ()=>transpileSchema,
-    transpileLocale: ()=>transpileLocale,
-    default: ()=>_default
+Object.defineProperty(module, "exports", {
+    enumerable: true,
+    get: ()=>_default
 });
 const _util = require("@middy/util");
-const _ajvCmd = require("ajv-cmd");
-const _ajvFtlI18N = _interopRequireDefault(require("ajv-ftl-i18n"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 const defaults = {
     eventSchema: undefined,
     contextSchema: undefined,
     responseSchema: undefined,
-    i18nEnabled: true,
     defaultLanguage: 'en',
     languages: {}
 };
 const validatorMiddleware = (opts = {})=>{
-    const { eventSchema , contextSchema , responseSchema , i18nEnabled , defaultLanguage , languages  } = {
+    const { eventSchema , contextSchema , responseSchema , defaultLanguage , languages  } = {
         ...defaults,
         ...opts
     };
@@ -38,14 +23,8 @@ const validatorMiddleware = (opts = {})=>{
         if (eventSchema) {
             const validEvent = await eventSchema(request.event);
             if (!validEvent) {
-                if (i18nEnabled) {
-                    const language = chooseLanguage(request.event, defaultLanguage);
-                    if (languages[language]) {
-                        languages[language](eventSchema.errors);
-                    } else {
-                        _ajvFtlI18N.default[language](eventSchema.errors);
-                    }
-                }
+                const localize = languages[request.event.preferredLanguage] ?? languages[defaultLanguage];
+                localize?.(eventSchema.errors);
                 throw (0, _util.createError)(400, 'Event object failed validation', {
                     cause: eventSchema.errors
                 });
@@ -73,30 +52,6 @@ const validatorMiddleware = (opts = {})=>{
         after: responseSchema ? validatorMiddlewareAfter : undefined
     };
 };
-const ajvDefaults = {
-    strict: true,
-    coerceTypes: 'array',
-    allErrors: true,
-    useDefaults: 'empty',
-    messages: true
-};
-const transpileSchema = (schema, ajvOptions)=>{
-    const options = {
-        ...ajvDefaults,
-        ...ajvOptions
-    };
-    return (0, _ajvCmd.compile)(schema, options);
-};
-const transpileLocale = _ajvCmd.ftl;
-const availableLanguages = Object.keys(_ajvFtlI18N.default);
-const chooseLanguage = ({ preferredLanguage  }, defaultLanguage)=>{
-    if (preferredLanguage) {
-        if (availableLanguages.includes(preferredLanguage)) {
-            return preferredLanguage;
-        }
-    }
-    return defaultLanguage;
-};
 const _default = validatorMiddleware;
 
 

package/index.js

@@ -1,16 +1,13 @@
 import { createError } from '@middy/util';
-import { compile, ftl } from 'ajv-cmd';
-import localize from 'ajv-ftl-i18n';
 const defaults = {
     eventSchema: undefined,
     contextSchema: undefined,
     responseSchema: undefined,
-    i18nEnabled: true,
     defaultLanguage: 'en',
     languages: {}
 };
 const validatorMiddleware = (opts = {})=>{
-    const { eventSchema , contextSchema , responseSchema , i18nEnabled , defaultLanguage , languages  } = {
+    const { eventSchema , contextSchema , responseSchema , defaultLanguage , languages  } = {
         ...defaults,
         ...opts
     };
@@ -18,14 +15,8 @@ const validatorMiddleware = (opts = {})=>{
         if (eventSchema) {
             const validEvent = await eventSchema(request.event);
             if (!validEvent) {
-                if (i18nEnabled) {
-                    const language = chooseLanguage(request.event, defaultLanguage);
-                    if (languages[language]) {
-                        languages[language](eventSchema.errors);
-                    } else {
-                        localize[language](eventSchema.errors);
-                    }
-                }
+                const localize = languages[request.event.preferredLanguage] ?? languages[defaultLanguage];
+                localize?.(eventSchema.errors);
                 throw createError(400, 'Event object failed validation', {
                     cause: eventSchema.errors
                 });
@@ -53,30 +44,6 @@ const validatorMiddleware = (opts = {})=>{
         after: responseSchema ? validatorMiddlewareAfter : undefined
     };
 };
-const ajvDefaults = {
-    strict: true,
-    coerceTypes: 'array',
-    allErrors: true,
-    useDefaults: 'empty',
-    messages: true
-};
-export const transpileSchema = (schema, ajvOptions)=>{
-    const options = {
-        ...ajvDefaults,
-        ...ajvOptions
-    };
-    return compile(schema, options);
-};
-export const transpileLocale = ftl;
-const availableLanguages = Object.keys(localize);
-const chooseLanguage = ({ preferredLanguage  }, defaultLanguage)=>{
-    if (preferredLanguage) {
-        if (availableLanguages.includes(preferredLanguage)) {
-            return preferredLanguage;
-        }
-    }
-    return defaultLanguage;
-};
 export default validatorMiddleware;
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.3",
   "description": "Validator middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -22,13 +22,25 @@
         "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"
+    "index.d.ts",
+    "transpile.js",
+    "transpile.cjs"
   ],
   "scripts": {
     "test": "npm run test:unit",
@@ -61,13 +73,13 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "4.0.0-alpha.1",
+    "@middy/util": "4.0.0-alpha.3",
     "ajv-cmd": "0.1.10"
   },
   "devDependencies": {
-    "@middy/core": "4.0.0-alpha.1",
+    "@middy/core": "4.0.0-alpha.3",
     "@types/http-errors": "^1.8.1",
     "ajv-bsontype": "^1.0.7"
   },
-  "gitHead": "b531f61dac3a5268728a21fc4b2b32054b170f88"
+  "gitHead": "d1c508197ccb3afcfed55013edc51c8e9f40c884"
 }

package/transpile.cjs

@@ -0,0 +1,33 @@
+"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, {
+    transpileSchema: ()=>transpileSchema,
+    transpileLocale: ()=>transpileLocale
+});
+const _ajvCmd = require("ajv-cmd");
+const ajvDefaults = {
+    strict: true,
+    coerceTypes: 'array',
+    allErrors: true,
+    useDefaults: 'empty',
+    messages: true
+};
+const transpileSchema = (schema, ajvOptions)=>{
+    const options = {
+        ...ajvDefaults,
+        ...ajvOptions
+    };
+    return (0, _ajvCmd.compile)(schema, options);
+};
+const transpileLocale = _ajvCmd.ftl;
+
+
+//# sourceMappingURL=transpile.cjs.map

package/transpile.js

@@ -0,0 +1,19 @@
+import { compile, ftl } from 'ajv-cmd';
+const ajvDefaults = {
+    strict: true,
+    coerceTypes: 'array',
+    allErrors: true,
+    useDefaults: 'empty',
+    messages: true
+};
+export const transpileSchema = (schema, ajvOptions)=>{
+    const options = {
+        ...ajvDefaults,
+        ...ajvOptions
+    };
+    return compile(schema, options);
+};
+export const transpileLocale = ftl;
+
+
+//# sourceMappingURL=transpile.js.map