v7.3.0

Author: formly-bot

.travis.yml

@@ -17,6 +17,7 @@ before_install:
 before_script:
   - npm prune
 script:
+  - npm run eslint
   - npm run test
   - npm run check-coverage
 after_success:

dist/formly.js

@@ -1,5 +1,5 @@
 /*!
-* angular-formly JavaScript Library v7.2.3
+* angular-formly JavaScript Library v7.3.0
 *
 * @license MIT (http://license.angular-formly.com)
 *
@@ -153,7 +153,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	ngModule.constant('formlyApiCheck', _providersFormlyApiCheck2['default']);
 	ngModule.constant('formlyErrorAndWarningsUrlPrefix', _otherDocsBaseUrl2['default']);
-	ngModule.constant('formlyVersion', ("7.2.3")); // <-- webpack variable
+	ngModule.constant('formlyVersion', ("7.3.0")); // <-- webpack variable
 
 	ngModule.provider('formlyUsability', _providersFormlyUsability2['default']);
 	ngModule.provider('formlyConfig', _providersFormlyConfig2['default']);
@@ -372,6 +372,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  fieldGroup: apiCheck.arrayOf(apiCheck.oneOfType([formlyFieldOptions, apiCheck.object])),
 	  className: apiCheck.string.optional,
 	  options: formOptionsApi.optional,
+	  templateOptions: apiCheck.object.optional,
+	  wrapper: specifyWrapperType.optional,
 	  hide: apiCheck.bool.optional,
 	  hideExpression: formlyExpression.optional,
 	  data: apiCheck.object.optional,
@@ -422,7 +424,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("7.2.3") + "/other/ERRORS_AND_WARNINGS.md#";
+	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("7.3.0") + "/other/ERRORS_AND_WARNINGS.md#";
 	module.exports = exports["default"];
 
 /***/ },
@@ -1210,8 +1212,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	      fields: '=?',
 	      formState: '=?',
 	      formOptions: '=?',
-	      form: '=?' // TODO require form in a breaking release
-	    },
+	      form: '=?' },
+	    // TODO require form in a breaking release
 	    controller: FormlyFieldController,
 	    link: fieldLink
 	  };
@@ -1433,7 +1435,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      if (scope.options.key) {
 	        modelValue = 'model[\'' + scope.options.key + '\']';
 	      }
-	      setElementTemplate('\n          <formly-form model="' + modelValue + '"\n                       fields="options.fieldGroup"\n                       options="options.options"\n                       form="options.form"\n                       class="' + scope.options.className + '"\n                       ' + extraAttributes + '\n                       is-field-group>\n          </formly-form>\n        ');
+	      getTemplate('\n          <formly-form model="' + modelValue + '"\n                       fields="options.fieldGroup"\n                       options="options.options"\n                       form="options.form"\n                       class="' + scope.options.className + '"\n                       ' + extraAttributes + '\n                       is-field-group>\n          </formly-form>\n        ').then(transcludeInWrappers(scope.options, scope.formOptions)).then(setElementTemplate);
 	    }
 
 	    function addAttributes() {

dist/formly.min.js

@@ -1,5 +1,5 @@
 /* eslint-env node */
-require('./set-env')(process.argv);
+require('argv-set-env')();
 const path = require('path');
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';

dist/formly.min.js.map

@@ -1,5 +1,5 @@
 /* eslint-env node */
-require('./set-env')(process.argv);
+require('argv-set-env')();
 const packageJson = require('../package.json');
 
 const here = require('path-here');

other/karma.conf.es6.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-formly",
-  "version": "7.2.3",
+  "version": "7.3.0",
   "author": "Astrism <[email protected]>",
   "contributors": [
     "Astrism <[email protected]>",
@@ -27,20 +27,25 @@
     "build:dist": "webpack --progress --colors --set-env-NODE_ENV=development",
     "build:prod": "webpack --progress --colors --set-env-NODE_ENV=production",
     "build": "npm run build:dist & npm run build:prod",
+    "eslint:test": "eslint -c other/test.eslintrc --ignore-pattern '**/*.+(test|mock).js' src/",
+    "eslint:src": "eslint -c other/src.eslintrc --ignore-pattern '!**/*.+(test|mock).js' src/",
+    "eslint": "npm run eslint:test -s && npm run eslint:src -s",
     "test": "karma start --single-run --set-env-COVERAGE=true --set-env-NODE_ENV=test",
     "test:watch": "karma start --set-env-COVERAGE=true --set-env-NODE_ENV=test",
     "test:debug": "karma start --browsers Chrome --set-env-NODE_ENV=test",
     "start": "npm run test:watch",
     "check-coverage": "istanbul check-coverage --statements 93 --branches 89 --functions 92 --lines 92",
     "report-coverage": "cat ./coverage/lcov.info | node_modules/.bin/codecov",
     "commit": "git-cz",
-    "prepublish": "npm run build",
-    "postpublish": "publish-latest --user-email [email protected] --user-name formly-bot",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
+    "publish-latest": "publish-latest --user-email [email protected] --user-name formly-bot",
+    "semantic-release": "semantic-release pre && npm run build && npm publish && npm run publish-latest && semantic-release post"
   },
   "config": {
     "ghooks": {
-      "commit-msg": "./node_modules/.bin/validate-commit-msg && npm t && npm run check-coverage"
+      "commit-msg": "./node_modules/.bin/validate-commit-msg && npm run eslint && npm t && npm run check-coverage"
+    },
+    "commitizen": {
+      "path": "node_modules/cz-conventional-changelog"
     }
   },
   "description": "AngularJS directive which takes JSON representing a form and renders to HTML",
@@ -52,28 +57,29 @@
     "angular": "1.4.7",
     "angular-mocks": "1.4.7",
     "api-check": "7.5.3",
+    "argv-set-env": "1.0.0",
     "babel": "5.8.23",
     "babel-eslint": "4.1.3",
     "babel-loader": "5.3.2",
-    "chai": "3.3.0",
+    "chai": "3.4.0",
     "codecov.io": "0.1.6",
-    "commitizen": "2.0.2",
+    "commitizen": "2.3.0",
     "cracks": "3.1.1",
     "cz-conventional-changelog": "1.1.4",
     "deindent": "0.1.0",
-    "eslint": "1.6.0",
-    "eslint-config-kentcdodds": "4.0.1",
-    "eslint-loader": "1.0.0",
+    "eslint": "1.7.3",
+    "eslint-config-kentcdodds": "5.0.0",
+    "eslint-loader": "1.1.0",
     "eslint-plugin-mocha": "1.0.0",
     "ghooks": "0.3.2",
     "http-server": "0.8.5",
     "isparta": "3.1.0",
     "isparta-loader": "1.0.0",
-    "istanbul": "0.3.22",
-    "karma": "0.13.10",
+    "istanbul": "0.4.0",
+    "karma": "0.13.14",
     "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "0.2.0",
-    "karma-coverage": "0.5.2",
+    "karma-chrome-launcher": "0.2.1",
+    "karma-coverage": "0.5.3",
     "karma-firefox-launcher": "0.1.6",
     "karma-mocha": "0.2.0",
     "karma-sinon": "1.0.4",
@@ -88,7 +94,7 @@
     "publish-latest": "1.1.2",
     "raw-loader": "0.5.1",
     "semantic-release": "4.3.5",
-    "sinon": "1.17.1",
+    "sinon": "1.17.2",
     "sinon-chai": "2.8.0",
     "uglify-loader": "1.2.0",
     "validate-commit-msg": "1.0.0",
@@ -100,9 +106,6 @@
       "angular": "*"
     }
   },
-  "czConfig": {
-    "path": "node_modules/cz-conventional-changelog"
-  },
   "release": {
     "verfiyRelease": {
       "path": "cracks",

other/set-env.js

@@ -1,9 +1,9 @@
 // some versions of angular don't export the angular module properly,
 // so we get it from window in this case.
-let angular = require('angular');
+let angular = require('angular')
 
 /* istanbul ignore next */
 if (!angular.version) {
-  angular = window.angular;
+  angular = window.angular
 }
-export default angular;
+export default angular

other/webpack.config.es6.js

@@ -1,82 +1,82 @@
-import angular from 'angular-fix';
-export default formlyCustomValidation;
+import angular from 'angular-fix'
+export default formlyCustomValidation
 
 // @ngInject
 function formlyCustomValidation(formlyUtil) {
   return {
     restrict: 'A',
     require: 'ngModel',
     link: function formlyCustomValidationLink(scope, el, attrs, ctrl) {
-      const opts = scope.options;
-      opts.validation.messages = opts.validation.messages || {};
+      const opts = scope.options
+      opts.validation.messages = opts.validation.messages || {}
       angular.forEach(opts.validation.messages, (message, key) => {
         opts.validation.messages[key] = () => {
-          return formlyUtil.formlyEval(scope, message, ctrl.$modelValue, ctrl.$viewValue);
-        };
-      });
+          return formlyUtil.formlyEval(scope, message, ctrl.$modelValue, ctrl.$viewValue)
+        }
+      })
 
 
-      const useNewValidatorsApi = ctrl.hasOwnProperty('$validators') && !attrs.hasOwnProperty('useParsers');
-      angular.forEach(opts.validators, angular.bind(null, addValidatorToPipeline, false));
-      angular.forEach(opts.asyncValidators, angular.bind(null, addValidatorToPipeline, true));
+      const useNewValidatorsApi = ctrl.hasOwnProperty('$validators') && !attrs.hasOwnProperty('useParsers')
+      angular.forEach(opts.validators, angular.bind(null, addValidatorToPipeline, false))
+      angular.forEach(opts.asyncValidators, angular.bind(null, addValidatorToPipeline, true))
 
       function addValidatorToPipeline(isAsync, validator, name) {
-        setupMessage(validator, name);
-        validator = angular.isObject(validator) ? validator.expression : validator;
+        setupMessage(validator, name)
+        validator = angular.isObject(validator) ? validator.expression : validator
         if (useNewValidatorsApi) {
-          setupWithValidators(validator, name, isAsync);
+          setupWithValidators(validator, name, isAsync)
         } else {
-          setupWithParsers(validator, name, isAsync);
+          setupWithParsers(validator, name, isAsync)
         }
       }
 
       function setupMessage(validator, name) {
-        const message = validator.message;
+        const message = validator.message
         if (message) {
           opts.validation.messages[name] = () => {
-            return formlyUtil.formlyEval(scope, message, ctrl.$modelValue, ctrl.$viewValue);
-          };
+            return formlyUtil.formlyEval(scope, message, ctrl.$modelValue, ctrl.$viewValue)
+          }
         }
       }
 
       function setupWithValidators(validator, name, isAsync) {
-        const validatorCollection = isAsync ? '$asyncValidators' : '$validators';
+        const validatorCollection = isAsync ? '$asyncValidators' : '$validators'
 
         ctrl[validatorCollection][name] = function evalValidity(modelValue, viewValue) {
-          return formlyUtil.formlyEval(scope, validator, modelValue, viewValue);
-        };
+          return formlyUtil.formlyEval(scope, validator, modelValue, viewValue)
+        }
       }
 
       function setupWithParsers(validator, name, isAsync) {
-        let inFlightValidator;
+        let inFlightValidator
         ctrl.$parsers.unshift(function evalValidityOfParser(viewValue) {
-          const isValid = formlyUtil.formlyEval(scope, validator, ctrl.$modelValue, viewValue);
+          const isValid = formlyUtil.formlyEval(scope, validator, ctrl.$modelValue, viewValue)
           if (isAsync) {
-            ctrl.$pending = ctrl.$pending || {};
-            ctrl.$pending[name] = true;
-            inFlightValidator = isValid;
+            ctrl.$pending = ctrl.$pending || {}
+            ctrl.$pending[name] = true
+            inFlightValidator = isValid
             isValid.then(() => {
               if (inFlightValidator === isValid) {
-                ctrl.$setValidity(name, true);
+                ctrl.$setValidity(name, true)
               }
             }).catch(() => {
               if (inFlightValidator === isValid) {
-                ctrl.$setValidity(name, false);
+                ctrl.$setValidity(name, false)
               }
             }).finally(() => {
-              const $pending = ctrl.$pending || {};
+              const $pending = ctrl.$pending || {}
               if (Object.keys($pending).length === 1) {
-                delete ctrl.$pending;
+                delete ctrl.$pending
               } else {
-                delete ctrl.$pending[name];
+                delete ctrl.$pending[name]
               }
-            });
+            })
           } else {
-            ctrl.$setValidity(name, isValid);
+            ctrl.$setValidity(name, isValid)
           }
-          return viewValue;
-        });
+          return viewValue
+        })
       }
-    }
-  };
+    },
+  }
 }