vee-validate 2.1.2 → 2.1.3

package/dist/vee-validate.js

@@ -1,5 +1,5 @@
 /**
-  * vee-validate v2.1.2
+  * vee-validate v2.1.3
   * (c) 2018 Abdelrahman Awad
   * @license MIT
   */
@@ -5238,130 +5238,148 @@
     }, {});
   };
 
-  // VNode Utils
-
-  // Gets the model object on the vnode.
-  function findModel (vnode) {
-    if (!vnode.data) {
-      return null;
-    }
-
-    // Component Model
-    if (vnode.data.model) {
-      return vnode.data.model;
-    }
-
-    return !!(vnode.data.directives) && find(vnode.data.directives, function (d) { return d.name === 'model'; });
-  }
-
-  function extractVNodes (vnode) {
-    if (findModel(vnode)) {
-      return [vnode];
-    }
-
-    var children = Array.isArray(vnode) ? vnode : vnode.children;
-    if (!Array.isArray(children)) {
-      return [];
-    }
-
-    return children.reduce(function (nodes, node) {
-      var candidates = extractVNodes(node);
-      if (candidates.length) {
-        nodes.push.apply(nodes, candidates);
-      }
-
-      return nodes;
-    }, []);
-  }
-
-  // Resolves v-model config if exists.
-  function findModelConfig (vnode) {
-    if (!vnode.componentOptions) { return null; }
-
-    return vnode.componentOptions.Ctor.options.model;
-  }
-  // Adds a listener to vnode listener object.
-  function mergeVNodeListeners (obj, eventName, handler) {
-    // Has a single listener.
-    if (isCallable(obj[eventName])) {
-      var prevHandler = obj[eventName];
-      obj[eventName] = [prevHandler];
-    }
-
-    // has other listeners.
-    if (Array.isArray(obj[eventName])) {
-      obj[eventName].push(handler);
-      return;
-    }
-
-    // no listener at all.
-    if (isNullOrUndefined(obj[eventName])) {
-      obj[eventName] = [handler];
-    }
-  }
-
-  // Adds a listener to a native HTML vnode.
-  function addNativeNodeListener (node, eventName, handler) {
-    if (isNullOrUndefined(node.data.on)) {
-      node.data.on = {};
-    }
-
-    mergeVNodeListeners(node.data.on, eventName, handler);
-  }
-
-  // Adds a listener to a Vue component vnode.
-  function addComponentNodeListener (node, eventName, handler) {
-    /* istanbul ignore next */
-    if (!node.componentOptions.listeners) {
-      node.componentOptions.listeners = {};
-    }
-
-    mergeVNodeListeners(node.componentOptions.listeners, eventName, handler);
-  }
-  function addVNodeListener (vnode, eventName, handler) {
-    if (vnode.componentOptions) {
-      addComponentNodeListener(vnode, eventName, handler);
-    }
-
-    addNativeNodeListener(vnode, eventName, handler);
-  }
-  // Determines if `change` should be used over `input` for listeners.
-  function getInputEventName (vnode, model) {
-    // Is a component.
-    if (vnode.componentOptions) {
+  // VNode Utils
+
+  // Gets the model object on the vnode.
+  function findModel (vnode) {
+    if (!vnode.data) {
+      return null;
+    }
+
+    // Component Model
+    if (vnode.data.model) {
+      return vnode.data.model;
+    }
+
+    return !!(vnode.data.directives) && find(vnode.data.directives, function (d) { return d.name === 'model'; });
+  }
+
+  function extractVNodes (vnode) {
+    if (findModel(vnode)) {
+      return [vnode];
+    }
+
+    var children = Array.isArray(vnode) ? vnode : vnode.children;
+    if (!Array.isArray(children)) {
+      return [];
+    }
+
+    return children.reduce(function (nodes, node) {
+      var candidates = extractVNodes(node);
+      if (candidates.length) {
+        nodes.push.apply(nodes, candidates);
+      }
+
+      return nodes;
+    }, []);
+  }
+
+  // Resolves v-model config if exists.
+  function findModelConfig (vnode) {
+    if (!vnode.componentOptions) { return null; }
+
+    return vnode.componentOptions.Ctor.options.model;
+  }
+  // Adds a listener to vnode listener object.
+  function mergeVNodeListeners (obj, eventName, handler) {
+    // Has a single listener.
+    if (isCallable(obj[eventName])) {
+      var prevHandler = obj[eventName];
+      obj[eventName] = [prevHandler];
+    }
+
+    // has other listeners.
+    if (Array.isArray(obj[eventName])) {
+      obj[eventName].push(handler);
+      return;
+    }
+
+    // no listener at all.
+    if (isNullOrUndefined(obj[eventName])) {
+      obj[eventName] = [handler];
+    }
+  }
+
+  // Adds a listener to a native HTML vnode.
+  function addNativeNodeListener (node, eventName, handler) {
+    if (isNullOrUndefined(node.data.on)) {
+      node.data.on = {};
+    }
+
+    mergeVNodeListeners(node.data.on, eventName, handler);
+  }
+
+  // Adds a listener to a Vue component vnode.
+  function addComponentNodeListener (node, eventName, handler) {
+    /* istanbul ignore next */
+    if (!node.componentOptions.listeners) {
+      node.componentOptions.listeners = {};
+    }
+
+    mergeVNodeListeners(node.componentOptions.listeners, eventName, handler);
+  }
+  function addVNodeListener (vnode, eventName, handler) {
+    if (vnode.componentOptions) {
+      addComponentNodeListener(vnode, eventName, handler);
+    }
+
+    addNativeNodeListener(vnode, eventName, handler);
+  }
+  // Determines if `change` should be used over `input` for listeners.
+  function getInputEventName (vnode, model) {
+    // Is a component.
+    if (vnode.componentOptions) {
       var ref = findModelConfig(vnode) || { event: 'input' };
-      var event = ref.event;
-
-      return event;
-    }
-
-    // Lazy Models typically use change event
-    if (model && model.modifiers && model.modifiers.lazy) {
-      return 'change';
-    }
-
-    // is a textual-type input.
-    if (vnode.data.attrs && isTextInput({ type: vnode.data.attrs.type || 'text' })) {
-      return 'input';
-    }
-
-    return 'change';
-  }
-
-  function normalizeSlots (slots, ctx) {
-    return Object.keys(slots).reduce(function (arr, key) {
-      slots[key].forEach(function (vnode) {
-        if (!vnode.context) {
-          slots[key].context = ctx;
-          if (!vnode.data) {
-            vnode.data = {};
-          }
-          vnode.data.slot = key;
-        }
-      });
-
-      return arr.concat(slots[key]);
-    }, []);
+      var event = ref.event;
+
+      return event;
+    }
+
+    // Lazy Models typically use change event
+    if (model && model.modifiers && model.modifiers.lazy) {
+      return 'change';
+    }
+
+    // is a textual-type input.
+    if (vnode.data.attrs && isTextInput({ type: vnode.data.attrs.type || 'text' })) {
+      return 'input';
+    }
+
+    return 'change';
+  }
+
+  function normalizeSlots (slots, ctx) {
+    return Object.keys(slots).reduce(function (arr, key) {
+      slots[key].forEach(function (vnode) {
+        if (!vnode.context) {
+          slots[key].context = ctx;
+          if (!vnode.data) {
+            vnode.data = {};
+          }
+          vnode.data.slot = key;
+        }
+      });
+
+      return arr.concat(slots[key]);
+    }, []);
+  }
+
+  function createRenderless (h, vnode) {
+    // a single-root slot yay!
+    if (!Array.isArray(vnode)) {
+      return vnode;
+    }
+
+    if (vnode.length === 1) {
+      return vnode[0];
+    }
+
+    {
+      warn('Your slot should have one root element. Rendering a span as the root.');
+    }
+
+    // Renders a multi-root node, should throw a Vue error.
+    return vnode;
   }
 
   /**
@@ -5709,7 +5727,7 @@
   // 
 
   var isEvent = function (evt) {
-    return (isCallable(Event) && evt instanceof Event) || (evt && evt.srcElement);
+    return (typeof Event !== 'undefined' && isCallable(Event) && evt instanceof Event) || (evt && evt.srcElement);
   };
 
   var normalizeEvents = function (evts) {
@@ -6975,7 +6993,9 @@
   /**
    * Registers a field to be validated.
    */
-  Validator.prototype.attach = function attach (fieldOpts) {
+  Validator.prototype.attach = function attach (fieldOpts) {
+      var this$1 = this;
+
     // fixes initial value detection with v-model and select elements.
     var value = fieldOpts.initialValue;
     var field = new Field(fieldOpts);
@@ -6983,7 +7003,7 @@
 
     // validate the field initially
     if (field.immediate) {
-      this.validate(("#" + (field.id)), value || field.value, { vmId: fieldOpts.vmId });
+      VeeValidate$1.instance._vm.$nextTick(function () { return this$1.validate(("#" + (field.id)), value || field.value, { vmId: fieldOpts.vmId }); });
     } else {
       this._validate(field, value || field.value, { initial: true }).then(function (result) {
         field.flags.valid = result.valid;
@@ -7764,7 +7784,7 @@
         });
       };
 
-      this.syncValue(model.value);
+      this.value = model.value;
       this.validate().then(this.immediate || shouldRevalidate ? this.applyResult : silentHandler);
     }
 
@@ -7828,11 +7848,16 @@
     var providers = ctx.$_veeObserver.refs;
 
     return ctx.fieldDeps.reduce(function (acc, depName) {
-      if (providers[depName]) {
-        acc[depName] = providers[depName].value;
-        var unwatch = providers[depName].$watch('value', function () {
+      if (!providers[depName]) {
+        return acc;
+      }
+
+      acc[depName] = providers[depName].value;
+      var watcherName = "$__" + depName;
+      if (!isCallable(ctx[watcherName])) {
+        ctx[watcherName] = providers[depName].$watch('value', function () {
           ctx.validate(ctx.value).then(ctx.applyResult);
-          unwatch();
+          ctx[watcherName]();
         });
       }
 
@@ -7910,10 +7935,6 @@
         type: Boolean,
         default: false
       },
-      tag: {
-        type: String,
-        default: 'span'
-      },
       bails: {
         type: Boolean,
         default: function () { return VeeValidate$1.config.fastExit; }
@@ -8052,22 +8073,19 @@
       var slot = this.$scopedSlots.default;
       if (!isCallable(slot)) {
         {
-          warn('Did you forget to add a scoped slot to the ValidationProvider?');
+          warn('ValidationProvider expects a scoped slot. Did you forget to add "slot-scope" to your slot?');
         }
 
-        slot = function () { return normalizeSlots(this$1.$slots, this$1.$vnode.context); };
+        return createRenderless(h, this.$slots.default);
       }
 
       var nodes = slot(ctx);
       // Handle single-root slot.
-      nodes = Array.isArray(nodes) ? nodes : [nodes];
-      extractVNodes({ children: nodes }).forEach(function (input) {
+      extractVNodes(nodes).forEach(function (input) {
         addListeners.call(this$1, input);
       });
 
-      return h(this.tag, {
-        attrs: this.$attrs
-      }, nodes);
+      return createRenderless(h, nodes);
     },
     beforeDestroy: function beforeDestroy () {
       // cleanup reference.
@@ -8075,99 +8093,90 @@
     }
   };
 
-  var flagMergingStrategy = {
-    pristine: 'every',
-    dirty: 'some',
-    touched: 'some',
-    untouched: 'every',
-    valid: 'every',
-    invalid: 'some',
-    pending: 'some',
-    validated: 'every'
-  };
-
-  function mergeFlags (lhs, rhs, strategy) {
-    var stratName = flagMergingStrategy[strategy];
-
-    return [lhs, rhs][stratName](function (f) { return f; });
-  }
-
-  var ValidationObserver = {
-    name: 'ValidationObserver',
-    provide: function provide () {
-      return {
-        $_veeObserver: this
-      };
-    },
-    props: {
-      tag: {
-        type: String,
-        default: 'span'
-      }
-    },
-    data: function () { return ({
-      refs: {}
-    }); },
-    methods: {
+  var flagMergingStrategy = {
+    pristine: 'every',
+    dirty: 'some',
+    touched: 'some',
+    untouched: 'every',
+    valid: 'every',
+    invalid: 'some',
+    pending: 'some',
+    validated: 'every'
+  };
+
+  function mergeFlags (lhs, rhs, strategy) {
+    var stratName = flagMergingStrategy[strategy];
+
+    return [lhs, rhs][stratName](function (f) { return f; });
+  }
+
+  var ValidationObserver = {
+    name: 'ValidationObserver',
+    provide: function provide () {
+      return {
+        $_veeObserver: this
+      };
+    },
+    data: function () { return ({
+      refs: {}
+    }); },
+    methods: {
       $subscribe: function $subscribe (provider) {
         var obj;
-
-        this.refs = Object.assign({}, this.refs, ( obj = {}, obj[provider.vid] = provider, obj ));
-      },
+
+        this.refs = Object.assign({}, this.refs, ( obj = {}, obj[provider.vid] = provider, obj ));
+      },
       $unsubscribe: function $unsubscribe (ref) {
         var vid = ref.vid;
-
-        delete this.refs[vid];
-        this.refs = Object.assign({}, this.refs);
-      },
-      validate: function validate () {
-        return Promise.all(values(this.refs).map(function (ref) {
-          return ref.validate().then(function (result) {
-            ref.applyResult(result);
-
-            return result;
-          });
-        })).then(function (results) { return results.every(function (r) { return r.valid; }); });
-      },
-      reset: function reset () {
-        return values(this.refs).forEach(function (ref) {
-          ref.reset();
-        });
-      }
-    },
-    computed: {
-      ctx: function ctx () {
-        return values(this.refs).reduce(function (acc, provider) {
-          Object.keys(flagMergingStrategy).forEach(function (flag) {
-            if (!(flag in acc)) {
-              acc[flag] = provider.flags[flag];
-              return;
-            }
-
-            acc[flag] = mergeFlags(acc[flag], provider.flags[flag], flag);
-          });
-
-          acc.errors[provider.vid] = provider.messages;
-
-          return acc;
-        }, { errors: {} });
-      }
-    },
-    render: function render (h) {
-      var this$1 = this;
-
-      var slots = this.$scopedSlots.default;
-      if (!isCallable(slots)) {
-        slots = function () { return normalizeSlots(this$1.$slots, this$1.$vnode.context); };
-      }
-
-      var nodes = slots(this.ctx);
-
-      return h(this.tag, {
-        attrs: this.$attrs,
-        on: this.$listeners
-      }, Array.isArray(nodes) ? nodes : [nodes]);
-    }
+
+        delete this.refs[vid];
+        this.refs = Object.assign({}, this.refs);
+      },
+      validate: function validate () {
+        return Promise.all(values(this.refs).map(function (ref) {
+          return ref.validate().then(function (result) {
+            ref.applyResult(result);
+
+            return result;
+          });
+        })).then(function (results) { return results.every(function (r) { return r.valid; }); });
+      },
+      reset: function reset () {
+        return values(this.refs).forEach(function (ref) {
+          ref.reset();
+        });
+      }
+    },
+    computed: {
+      ctx: function ctx () {
+        return values(this.refs).reduce(function (acc, provider) {
+          Object.keys(flagMergingStrategy).forEach(function (flag) {
+            if (!(flag in acc)) {
+              acc[flag] = provider.flags[flag];
+              return;
+            }
+
+            acc[flag] = mergeFlags(acc[flag], provider.flags[flag], flag);
+          });
+
+          acc.errors[provider.vid] = provider.messages;
+
+          return acc;
+        }, { errors: {} });
+      }
+    },
+    render: function render (h) {
+      var slots = this.$scopedSlots.default;
+      if (!isCallable(slots)) {
+        {
+          warn('ValidationObserver expects a scoped slot. Did you forget to add "slot-scope" to your slot?');
+        }
+
+        return createRenderless(h, this.$slots.default);
+      }
+
+      return createRenderless(h, slots(this.ctx));
+    }
   };
 
   function withValidation (component, ctxToProps) {
@@ -8524,7 +8533,7 @@
   Object.defineProperties( VeeValidate$1.prototype, prototypeAccessors$6 );
   Object.defineProperties( VeeValidate$1, staticAccessors$2 );
 
-  VeeValidate$1.version = '2.1.2';
+  VeeValidate$1.version = '2.1.3';
   VeeValidate$1.mixin = mixin;
   VeeValidate$1.directive = directive;
   VeeValidate$1.Validator = Validator;