further additions to async validation

Author: matt-sanders

package.json

@@ -29,8 +29,8 @@
     "babel-loader": "6.2.4",
     "babel-plugin-transform-runtime": "6.12.0",
     "babel-preset-es2015": "6.9.0",
-    "babel-preset-stage-0": "6.5.0",
     "babel-preset-es2015-loose-rollup": "^7.0.0",
+    "babel-preset-stage-0": "6.5.0",
     "chai": "3.5.0",
     "conventional-changelog-cli": "1.2.0",
     "conventional-github-releaser": "1.1.3",
@@ -74,6 +74,7 @@
     "sinon-chai": "2.8.0",
     "style-loader": "0.13.1",
     "uglify-js": "^2.6.4",
+    "vue": "^2.2.6",
     "vue-hot-reload-api": "1.3.2",
     "vue-html-loader": "1.2.3",
     "vue-loader": "8.5.3",
@@ -82,5 +83,9 @@
     "webpack-dev-middleware": "1.6.1",
     "webpack-dev-server": "1.14.1",
     "webpack-merge": "0.14.1"
+  },
+  "dependencies": {
+    "babel-runtime": "^6.23.0",
+    "vue": "^2.2.6"
   }
 }

src/components/FormlyField.vue

@@ -54,13 +54,16 @@
 
          let valid = false;
          if ( typeof validator === 'function' ){
-           //valid = !validator(field, model);
+	   //set the asynchronous flag so that we know it's going
+	   let asyncKey = '$async_'+validKey;
+	   this.$set(this.form.$errors[ this.field.key ], asyncKey, true);
+	   
            // setup for async validation
            validator(field, model, (asyncValid = false, asyncValidatorMessage = validatorMessage) => {
              // whenever validation is done via a function we will assume it's asynchronous and will require next() to be called
              // this way it doesn't matter if it's async or not, next() should always be called
-             console.log(this.form);
              setError(this.form, this.field.key, validKey, !asyncValid, asyncValidatorMessage);
+	     this.$set(this.form.$errors[ this.field.key ], asyncKey, false);
            });
          } else {
            let res = new Function('model', 'field', 'return '+validator+';' );

test/unit/karma.conf.js

@@ -3,7 +3,8 @@ var wsConfig = require('./webpack.test.config');
 module.exports = function(config) {
     var settings = {
         // base path that will be used to resolve all patterns (eg. files, exclude)
-        basePath: '',
+      basePath: '',
+      plugins: ['karma-mocha', 'karma-chai', 'karma-sinon-chai', 'karma-webpack', 'karma-sourcemap-loader', 'karma-spec-reporter', 'karma-coverage', 'karma-phantomjs-launcher'],
 
         browsers: ['PhantomJS'],
 
@@ -45,4 +46,4 @@ module.exports = function(config) {
     }
 
     config.set(settings);
-}
+}

test/unit/specs/FormlyField.spec.js

@@ -303,10 +303,8 @@ describe('FormlyField', () => {
             type: 'test',
             validators: {
               asyncExpression: function(field, model, next){
-                console.log('--- first timeout here');
                 let valid = model.search == 'test';
                 setTimeout( function(){
-                  console.log('--------------- timeout here');
                   next( valid );
                 }, 500);
               }
@@ -316,12 +314,14 @@ describe('FormlyField', () => {
       };
 
       createValidField(data);
-      console.log('expression is ', vm.form.$errors.search.asyncExpression);
-      expect(vm.form.$errors.search.asyncExpression).to.be.true;
-      vm.model.search = 'test';
+      expect(vm.form.$errors.search.asyncExpression).to.be.false;
+      expect(vm.form.$errors.search.$async_asyncExpression).to.be.true;
+      vm.model.search = 'test';      
       setTimeout(()=>{
-        //expect(vm.form.$errors.search.expression).to.be.false;
-        //done();
+        expect(vm.form.$errors.search.asyncExpression).to.be.false;
+	expect(vm.form.$errors.search.$async_asyncExpression).to.be.false;
+	expect(vm.form.$valid).to.be.true;
+        done();
       },1000);
     });