Merge pull request balderdashy#1419 from balderdashy/streamline-valid…

…ations

[patch] Streamline validations

accessible/allowed-validations.js

@@ -0,0 +1 @@
+module.exports = require('anchor/accessible/rules');

lib/waterline/utils/system/validation-builder.js

@@ -16,49 +16,22 @@
 
 var _ = require('@sailshq/lodash');
 var anchor = require('anchor');
-var RESERVED_PROPERTY_NAMES = require('./reserved-property-names');
-var RESERVED_VALIDATION_NAMES = require('./reserved-validation-names');
+var RESERVED_VALIDATION_NAMES = require('../../../../accessible/allowed-validations');
 
 module.exports = function ValidationBuilder(attributes) {
-  // Hold the validations used for each attribute
-  var validations = {};
 
 
   //  ╔╦╗╔═╗╔═╗  ┌─┐┬ ┬┌┬┐  ┬  ┬┌─┐┬  ┬┌┬┐┌─┐┌┬┐┬┌─┐┌┐┌┌─┐
   //  ║║║╠═╣╠═╝  │ ││ │ │   └┐┌┘├─┤│  │ ││├─┤ │ ││ ││││└─┐
   //  ╩ ╩╩ ╩╩    └─┘└─┘ ┴    └┘ ┴ ┴┴─┘┴─┴┘┴ ┴ ┴ ┴└─┘┘└┘└─┘
-  _.each(attributes, function(attribute, attributeName) {
-    // Build a validation list for the attribute
-    validations[attributeName] = {};
+  var validations = _.reduce(attributes, function(memo, attribute, attributeName) {
 
-    // Process each property in the attribute and look for any validation
-    // properties.
-    _.each(attribute, function(property, propertyName) {
-      // Ignore NULL values
-      if (_.isNull(property)) {
-        return;
-      }
-
-      // If the property is reserved, don't do anything with it
-      if (_.indexOf(RESERVED_PROPERTY_NAMES, propertyName) > -1) {
-        return;
-      }
-
-      // If the property is an `enum` alias it to the anchor IN validation
-      if (propertyName.toLowerCase() === 'enum') {
-        validations[attributeName].in = property;
-        return;
-      }
+    // Build a validation list for the attribute
+    memo[attributeName] = attribute.validations || {};
 
-      // Otherwise validate that the property name is a valid anchor validation.
-      if (_.indexOf(RESERVED_VALIDATION_NAMES, propertyName) < 0) {
-        return;
-      }
+    return memo;
 
-      // Set the validation
-      validations[attributeName][propertyName] = property;
-    });
-  });
+  }, {});
 
 
   //  ╔╗ ╦ ╦╦╦  ╔╦╗  ┬  ┬┌─┐┬  ┬┌┬┐┌─┐┌┬┐┬┌─┐┌┐┌  ┌─┐┌┐┌
@@ -121,13 +94,6 @@ module.exports = function ValidationBuilder(attributes) {
         }
       }
 
-      // If Boolean and required manually check
-      if (curValidation.required && curValidation.type === 'boolean' && (!_.isUndefined(value)  && !_.isNull(value))) {
-        if (value.toString() === 'true' || value.toString() === 'false') {
-          return;
-        }
-      }
-
       // Run the Anchor validations
       var validationError = anchor(value).to(requirements.data, values);
 

package.json

@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@sailshq/lodash": "^3.10.2",
-    "anchor": "~0.11.2",
+    "anchor": "^1.0.0",
     "async": "2.0.1",
     "bluebird": "3.2.1",
     "flaverr": "^1.0.0",