fix: regex rule,messages ordering

Author: bitnbytesio

CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.3.3]
+
+### Fixed
+
+- message ordering
+
+### Changed
+
+- regex rule now accepts flags
+
+## [4.3.2]
+
+### Fixed
+
+- url rule breaks with non string value (issues/43)
+
 ## [4.3.1]
 
 ### Added

lib/rules/creditCard.js

@@ -1,6 +1,5 @@
 const v = require('validator');
 
-
 module.exports = function creditCard({ value }) {
   if (v.isCreditCard(String(value))) {
     return true;

lib/rules/regex.js

@@ -1,7 +1,6 @@
-
 module.exports = function regex({ value, args }) {
-  const [pattren] = args;
-  const regexp = new RegExp(pattren);
+  const [pattren, flags] = args;
+  const regexp = new RegExp(pattren, flags);
 
   if (!regexp.test(value)) {
     return false;

lib/rules/url.js

@@ -1,5 +1,9 @@
 const v = require('validator');
 
 module.exports = function url({ value }) {
+  if (typeof value !== 'string') {
+    return false;
+  }
+
   return v.isURL(value);
 };

lib/validator.js

@@ -477,16 +477,23 @@ class Validator {
     // check for local scope messages
     if (this.hasCustomMessages) {
       message = this.customMessages[`${attr}.${rule}`]
-        || this.customMessages[rule]
-        || this.customMessages[attr];
+        || this.customMessages[attr]
+        || this.customMessages[rule];
+
     }
 
     // not found in local scope, check for global scope
     if (!message) {
+      // from global messages bucket
       messages[this.lang].$custom = messages[this.lang].$custom || {};
+      // message.$custom['attribute.rule']
       message = messages[this.lang].$custom[`${attr}.${rule}`]
-        || messages[this.lang][rule]
-        || (messages[this.lang].$custom && messages[this.lang].$custom[attr]);
+        // message.$custom.rule
+        || messages[this.lang].$custom[rule]
+        // message.$custom.attr
+        || messages[this.lang].$custom[attr]
+        // message.rule
+        || messages[this.lang][rule];
 
       if (useDefaultMessage && !message) {
         message = defaultMessage;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-input-validator",
-  "version": "4.3.1",
+  "version": "4.3.3",
   "description": "validation library for nodejs, inspired by laravel.",
   "main": "lib/index.js",
   "scripts": {