v7.3.7

Author: formly-bot

dist/formly.js

@@ -1,5 +1,5 @@
 /*!
-* angular-formly JavaScript Library v7.3.6
+* angular-formly JavaScript Library v7.3.7
 *
 * @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.3.6")); // <-- webpack variable
+	ngModule.constant('formlyVersion', ("7.3.7")); // <-- webpack variable
 
 	ngModule.provider('formlyUsability', _providersFormlyUsability2['default']);
 	ngModule.provider('formlyConfig', _providersFormlyConfig2['default']);
@@ -424,7 +424,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("7.3.6") + "/other/ERRORS_AND_WARNINGS.md#";
+	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("7.3.7") + "/other/ERRORS_AND_WARNINGS.md#";
 	module.exports = exports["default"];
 
 /***/ },
@@ -846,9 +846,21 @@ return /******/ (function(modules) { // webpackBootstrap
 	var _angularFix2 = _interopRequireDefault(_angularFix);
 
 	exports['default'] = {
-	  formlyEval: formlyEval, getFieldId: getFieldId, reverseDeepMerge: reverseDeepMerge, findByNodeName: findByNodeName, arrayify: arrayify, extendFunction: extendFunction, extendArray: extendArray, startsWith: startsWith, contains: contains
+	  containsSelector: containsSelector, containsSpecialChar: containsSpecialChar, formlyEval: formlyEval, getFieldId: getFieldId, reverseDeepMerge: reverseDeepMerge, findByNodeName: findByNodeName,
+	  arrayify: arrayify, extendFunction: extendFunction, extendArray: extendArray, startsWith: startsWith, contains: contains
 	};
 
+	function containsSelector(string) {
+	  return containsSpecialChar(string, '.') || containsSpecialChar(string, '[') && containsSpecialChar(string, ']');
+	}
+
+	function containsSpecialChar(a, b) {
+	  if (!a || !a.indexOf) {
+	    return false;
+	  }
+	  return a.indexOf(b) !== -1;
+	}
+
 	function formlyEval(scope, expression, $modelValue, $viewValue, extraLocals) {
 	  if (_angularFix2['default'].isFunction(expression)) {
 	    return expression($viewValue, $modelValue, scope, extraLocals);
@@ -1268,7 +1280,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 
 	    function shouldNotUseParseKey(key) {
-	      return _angularFix2['default'].isNumber(key) || /^\d/.test(key) && key.indexOf('[') === -1;
+	      return _angularFix2['default'].isNumber(key) || !formlyUtil.containsSelector(key);
 	    }
 
 	    function parseSet(key, model, newVal) {

dist/formly.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-formly",
-  "version": "7.3.6",
+  "version": "7.3.7",
   "author": "Astrism <[email protected]>",
   "contributors": [
     "Astrism <[email protected]>",

dist/formly.min.js.map

@@ -83,7 +83,7 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo
     }
 
     function shouldNotUseParseKey(key) {
-      return angular.isNumber(key) || (/^\d/.test(key) && key.indexOf('[') === -1)
+      return angular.isNumber(key) || !formlyUtil.containsSelector(key)
     }
 
     function parseSet(key, model, newVal) {

package.json

@@ -572,6 +572,30 @@ describe('formly-field', function() {
       expect(scope.model[key]).to.eq(defaultValue)
     })
 
+    it('should work with dashes in the key', () => {
+      const key = 'address-1st-line'
+      const defaultValue = 'baz'
+      scope.fields = [
+        {template: input, key, defaultValue},
+      ]
+      scope.model = {}
+
+      compileAndDigest()
+      expect(scope.model[key]).to.eq(defaultValue)
+    })
+
+    it('should work with dashes and numerics in the key', () => {
+      const key = 'b141c66a-2857-4196-847b-b2096fa6170d'
+      const defaultValue = 'baz'
+      scope.fields = [
+        {template: input, key, defaultValue},
+      ]
+      scope.model = {}
+
+      compileAndDigest()
+      expect(scope.model[key]).to.eq(defaultValue)
+    })
+
     it('should work with nested keys with numbers in the key', () => {
       const key = 'foo3bar.baz4foobar'
       const defaultValue = 'baz'
@@ -581,7 +605,7 @@ describe('formly-field', function() {
       scope.model = {}
 
       compileAndDigest()
-      expect(scope.model.foo3bar.baz4foobar).to.equal(defaultValue)
+      expect(scope.model.foo3bar.baz4foobar).to.eq(defaultValue)
     })
   })
 

src/directives/formly-field.js

@@ -1,9 +1,22 @@
 import angular from 'angular-fix'
 
 export default {
-  formlyEval, getFieldId, reverseDeepMerge, findByNodeName, arrayify, extendFunction, extendArray, startsWith, contains,
+  containsSelector, containsSpecialChar, formlyEval, getFieldId, reverseDeepMerge, findByNodeName,
+  arrayify, extendFunction, extendArray, startsWith, contains,
 }
 
+function containsSelector(string) {
+  return containsSpecialChar(string, '.') || (containsSpecialChar(string, '[') && containsSpecialChar(string, ']'))
+}
+
+function containsSpecialChar(a, b) {
+  if (!a || !a.indexOf) {
+    return false
+  }
+  return a.indexOf(b) !== -1
+}
+
+
 function formlyEval(scope, expression, $modelValue, $viewValue, extraLocals) {
   if (angular.isFunction(expression)) {
     return expression($viewValue, $modelValue, scope, extraLocals)