js-laravel-validation - npm Package Compare versions

Comparing version 1.2.7 to 1.2.8

dist/api.js

@@ -5,2 +5,4 @@ "use strict";
 
+var _placeholders = require("./placeholders");
+
 var _index = require("./index");
@@ -11,3 +13,3 @@
   setMessageHandler: _messages.setMessageHandler,
-  getMessage: _messages.getMessage,
+  getMessage: _placeholders.generateMessage,
   getMessageHandler: _messages.getMessageHandler,
@@ -14,0 +16,0 @@ validateForm: _index.validate.validateForm

dist/index.js

@@ -10,3 +10,3 @@ "use strict";
 
-var _messages = require("./messages");
+var _placeholders = require("./placeholders");
 
@@ -75,5 +75,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
       if (includeMessages) {
-        messages.push(result.errors.map(function (rule) {
-          return (0, _messages.getMessage)(rule, fieldData);
-        }));
+        var fieldMessages = result.errors.map(function (rule) {
+          return (0, _placeholders.generateMessage)(rule, fieldData);
+        });
+        messages.push(fieldMessages);
       }
@@ -80,0 +81,0 @@

dist/messages.js

@@ -10,2 +10,3 @@ "use strict";
 exports.getMessageHandler = getMessageHandler;
+exports.messages = void 0;
 
@@ -15,67 +16,184 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 var messages = {
-  /*accepted: () => "",
-   // active_url: ({ value }) => {
-    //This cannot be supported because JS does not support hostname lookups (dns_get_record in PHP)
-    //This could be implemented if there was a reliable way to host a small API to do the lookup
+  accepted: function accepted() {
+    return "The :attribute must be accepted.";
+  },
+  // active_url: ({ value }) => {
+  //This cannot be supported because JS does not support hostname lookups (dns_get_record in PHP)
+  //This could be implemented if there was a reliable way to host a small API to do the lookup
   // },
-   after: () => "",
-  after_or_equal: () => "",
-   alpha: () => "",
-  alpha_dash: () => "",
-  alpha_num: () => "",
-   array: () => "",
-   //bail: is on by default but is `validateForm` call
-   before: () => "",
-  before_or_equal: () => "",
-   between: () => "",
-   boolean: () => "",
-   confirmed: () => "",
-  
-  date: () => "",
-  date_equals: () => "",
-   //date_format
-   different: () => "",
-   digits: () => "",
-  digits_between: () => "",
-   distinct: () => "",
-   email: () => "",
-   file: () => "",
-   filled: () => "",
-   gt: () => "",
-  gte: () => "",
-   image: () => "",
-   in: () => "",
-  in_array: () => "",
-  
-  integer: () => "",
-   ip: () => "",
-  ipv4: () => "",
-  ipv6: () => "",
-   json: () => "",
-   lt: () => "",
-  lte: () => "",
-   max: () => "",
-   //mimetypes?
-   min: () => "",
-   not_in: () => "",
-   //not_regex
-   //nullable: implemented in `validateField` method (index.js)
-   numeric: () => "",
-   present: () => "",
-   //regex
-   required: () => "",
-  required_if: () => "",
-  required_unless: () => "",
-  required_with: () => "",
-  required_with_all: () => "",
-  required_without: () => "",
-  required_without_all: () => "",
-   same: () => "",
-   size: () => "",
-   string: () => "",
-   timezone: () => "",
-   url: () => "",
-   uuid: () => "",*/
+  after: function after() {
+    return "The :attribute must be a date after :date.";
+  },
+  after_or_equal: function after_or_equal() {
+    return "The :attribute must be a date after or equal to :date.";
+  },
+  alpha: function alpha() {
+    return "The :attribute may only contain letters.";
+  },
+  alpha_dash: function alpha_dash() {
+    return "The :attribute may only contain letters, numbers, dashes and underscores.";
+  },
+  // I don't think that's what this rule does
+  alpha_num: function alpha_num() {
+    return "The :attribute may only contain letters and numbers.";
+  },
+  array: function array() {
+    return "The :attribute must be an array.";
+  },
+  //bail: is on by default but is `validateForm` call
+  before: function before() {
+    return "The :attribute must be a date before :date.";
+  },
+  before_or_equal: function before_or_equal() {
+    return "The :attribute must be a date before or equal to :date.";
+  },
+  between: function between() {
+    return "";
+  },
+  // TODO this one is more complicated
+  boolean: function boolean() {
+    return "The :attribute field must be true or false.";
+  },
+  confirmed: function confirmed() {
+    return "The :attribute confirmation does not match.";
+  },
+  date: function date() {
+    return "The :attribute is not a valid date.";
+  },
+  date_equals: function date_equals() {
+    return "The :attribute must be a date equal to :date.";
+  },
+  //date_format: () => "The :attribute does not match the format :format.",
+  different: function different() {
+    return "The :attribute and :other must be different.";
+  },
+  digits: function digits() {
+    return "The :attribute must be :digits digits.";
+  },
+  digits_between: function digits_between() {
+    return "The :attribute must be between :min and :max digits.";
+  },
+  dimensions: function dimensions() {
+    return "The :attribute has invalid image dimensions.";
+  },
+  distinct: function distinct() {
+    return "The :attribute field has a duplicate value.";
+  },
+  email: function email() {
+    return "The :attribute must be a valid email address.";
+  },
+  file: function file() {
+    return "The :attribute must be a file.";
+  },
+  filled: function filled() {
+    return "The :attribute field must have a value.";
+  },
+  gt: function gt() {
+    return "";
+  },
+  // TODO this one is more complicated
+  gte: function gte() {
+    return "";
+  },
+  // TODO this one is more complicated
+  image: function image() {
+    return "The :attribute must be an image.";
+  },
+  in: function _in() {
+    return "The selected :attribute is invalid.";
+  },
+  in_array: function in_array() {
+    return "The :attribute field does not exist in :other.";
+  },
+  integer: function integer() {
+    return "The :attribute must be an integer.";
+  },
+  ip: function ip() {
+    return "The :attribute must be a valid IP address.";
+  },
+  ipv4: function ipv4() {
+    return "The :attribute must be a valid IPv4 address.";
+  },
+  ipv6: function ipv6() {
+    return "The :attribute must be a valid IPv6 address.";
+  },
+  json: function json() {
+    return "The :attribute must be a valid JSON string.";
+  },
+  lt: function lt() {
+    return "";
+  },
+  // TODO this is more complicated, and is it done with size?
+  lte: function lte() {
+    return "";
+  },
+  // TODO this is more complicated, and is it done with size?
+  max: function max() {
+    return "";
+  },
+  // TODO this is more complicated, and is it done with size?
+  // mimes?
+  // mimetypes?
+  min: function min() {
+    return "";
+  },
+  // TODO this is more complicated, and is it done with size?
+  not_in: function not_in() {
+    return "The selected :attribute is invalid.";
+  },
+  //not_regex
+  //nullable: implemented in `validateField` method (index.js)
+  numeric: function numeric() {
+    return "The :attribute must be a number.";
+  },
+  present: function present() {
+    return "The :attribute field must be present.";
+  },
+  //regex
+  required: function required() {
+    return "The :attribute field is required.";
+  },
+  required_if: function required_if() {
+    return "The :attribute field is required when :other is :value.";
+  },
+  required_unless: function required_unless() {
+    return "The :attribute field is required unless :other is in :values.";
+  },
+  required_with: function required_with() {
+    return "The :attribute field is required when :values is present.";
+  },
+  required_with_all: function required_with_all() {
+    return "The :attribute field is required when :values are present.";
+  },
+  required_without: function required_without() {
+    return "The :attribute field is required when :values is not present.";
+  },
+  required_without_all: function required_without_all() {
+    return "The :attribute field is required when none of :values are present.";
+  },
+  same: function same() {
+    return "The :attribute and :other must match.";
+  },
+  size: function size() {
+    return "";
+  },
+  // TODO this is more complicated
+  // TODO starts_with
+  string: function string() {
+    return "The :attribute must be a string.";
+  },
+  timezone: function timezone() {
+    return "The :attribute must be a valid zone.";
+  },
+  // TODO unique
+  url: function url() {
+    return "The :attribute format is invalid.";
+  },
+  uuid: function uuid() {
+    return "The :attribute must be a valid UUID.";
+  }
 }; //export default messages;
 
+exports.messages = messages;
+
 function setMessageHandlers(newMessages) {
@@ -89,8 +207,8 @@ Object.assign(messages, newMessages);
 
-function getMessage(rule, params) {
+function getMessage(rule, fieldData) {
   if (messages[rule] === undefined) {
-    return rule;
+    return "";
   }
 
-  return messages[rule](params);
+  return messages[rule](fieldData);
 }
@@ -97,0 +215,0 @@

package.json

 {
   "name": "js-laravel-validation",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Laravel style form validation for JavaScript",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -35,3 +35,3 @@ # js-laravel-validation [![npm version](https://badge.fury.io/js/js-laravel-validation.svg)](https://badge.fury.io/js/js-laravel-validation) [![Build Status](https://travis-ci.org/nik-m2/js-laravel-validation.svg?branch=master)](https://travis-ci.org/nik-m2/js-laravel-validation)
 
-## API
+## Docs
 
@@ -38,0 +38,0 @@ | Function Name  | Description |

No alert changes

Improved metrics

Total package byte prevSize

50660

increased by26.24%

Number of package files

12

increased by9.09%

Lines of code

1143

increased by37.21%

No dependency changes