enhance analyseMask for regex: '[0-9]{2}|[0-9]{3}'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.32",
   "main": [
 	  "./dist/inputmask/inputmask.js",
 	  "./dist/inputmask/inputmask.extensions.js",

component.json

@@ -2,7 +2,7 @@
 	"name": "inputmask",
 	"repository": "robinherbots/Inputmask",
 	"description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-	"version": "4.0.0-beta.31",
+	"version": "4.0.0-beta.32",
 	"keywords": [
 		"jquery",
 		"plugins",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/inputmask",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.32",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",

dist/inputmask/bindings/inputmask.binding.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/global/document.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/global/window.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {
@@ -1436,7 +1436,7 @@
                     if (insertTestDefinition(currentOpeningToken = openenings[openenings.length - 1], m), 
                     currentOpeningToken.isAlternator) {
                         alternator = openenings.pop();
-                        for (var mndx = 0; mndx < alternator.matches.length; mndx++) alternator.matches[mndx].isGroup = !1;
+                        for (var mndx = 0; mndx < alternator.matches.length; mndx++) alternator.matches[mndx].isGroup && (alternator.matches[mndx].isGroup = !1);
                         openenings.length > 0 ? (currentOpeningToken = openenings[openenings.length - 1]).matches.push(alternator) : currentToken.matches.push(alternator);
                     }
                 } else insertTestDefinition(currentToken, m);
@@ -1489,7 +1489,11 @@
                         jit: mqj[1]
                     };
                     var matches = openenings.length > 0 ? openenings[openenings.length - 1].matches : currentToken.matches;
-                    (match = matches.pop()).isAlternator && (matches.push(match), match = (matches = match.matches).pop()), 
+                    if ((match = matches.pop()).isAlternator) {
+                        matches.push(match), matches = match.matches;
+                        var groupToken = new MaskToken(!0), tmpMatch = matches.pop();
+                        matches.push(groupToken), matches = groupToken.matches, match = tmpMatch;
+                    }
                     match.isGroup || (regexMask && null === match.fn && "." === match.def && (match.fn = new RegExp(match.def, opts.casing ? "i" : "")), 
                     match = groupify([ match ])), matches.push(match), matches.push(quantifier);
                     break;
@@ -1537,7 +1541,7 @@
                 }
                 var st;
                 return maskToken;
-            }(maskTokens[0]), console.log(JSON.stringify(maskTokens)), maskTokens;
+            }(maskTokens[0]), maskTokens;
         }
     }, Inputmask.extendDefaults = function(options) {
         $.extend(!0, Inputmask.prototype.defaults, options);

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-be.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ca.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-hu.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-mx.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-nl.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ru.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-uk.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(factory) {

dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(modules) {
@@ -1475,7 +1475,7 @@
                         if (insertTestDefinition(currentOpeningToken = openenings[openenings.length - 1], m), 
                         currentOpeningToken.isAlternator) {
                             alternator = openenings.pop();
-                            for (var mndx = 0; mndx < alternator.matches.length; mndx++) alternator.matches[mndx].isGroup = !1;
+                            for (var mndx = 0; mndx < alternator.matches.length; mndx++) alternator.matches[mndx].isGroup && (alternator.matches[mndx].isGroup = !1);
                             openenings.length > 0 ? (currentOpeningToken = openenings[openenings.length - 1]).matches.push(alternator) : currentToken.matches.push(alternator);
                         }
                     } else insertTestDefinition(currentToken, m);
@@ -1528,7 +1528,11 @@
                             jit: mqj[1]
                         };
                         var matches = openenings.length > 0 ? openenings[openenings.length - 1].matches : currentToken.matches;
-                        (match = matches.pop()).isAlternator && (matches.push(match), match = (matches = match.matches).pop()), 
+                        if ((match = matches.pop()).isAlternator) {
+                            matches.push(match), matches = match.matches;
+                            var groupToken = new MaskToken(!0), tmpMatch = matches.pop();
+                            matches.push(groupToken), matches = groupToken.matches, match = tmpMatch;
+                        }
                         match.isGroup || (regexMask && null === match.fn && "." === match.def && (match.fn = new RegExp(match.def, opts.casing ? "i" : "")), 
                         match = groupify([ match ])), matches.push(match), matches.push(quantifier);
                         break;
@@ -1576,7 +1580,7 @@
                     }
                     var st;
                     return maskToken;
-                }(maskTokens[0]), console.log(JSON.stringify(maskTokens)), maskTokens;
+                }(maskTokens[0]), maskTokens;
             }
         }, Inputmask.extendDefaults = function(options) {
             $.extend(!0, Inputmask.prototype.defaults, options);

dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 !function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):window.dependencyLib=e(jQuery)}(function(e){return e});

dist/min/inputmask/global/document.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 "function"==typeof define&&define.amd?define(function(){return document}):"object"==typeof exports&&(module.exports=document);

dist/min/inputmask/global/window.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2018 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-beta.31
+* Version: 4.0.0-beta.32
 */
 
 "function"==typeof define&&define.amd?define(function(){return window}):"object"==typeof exports&&(module.exports=window);

js/inputmask.js

@@ -405,7 +405,7 @@
                         if (currentOpeningToken.isAlternator) { //handle alternator a | b case
                             alternator = openenings.pop();
                             for (var mndx = 0; mndx < alternator.matches.length; mndx++) {
-                                alternator.matches[mndx].isGroup = false; //don't mark alternate groups as group
+                                if (alternator.matches[mndx].isGroup) alternator.matches[mndx].isGroup = false; //don't mark alternate groups as group
                             }
                             if (openenings.length > 0) {
                                 currentOpeningToken = openenings[openenings.length - 1];
@@ -543,9 +543,13 @@
                             var matches = openenings.length > 0 ? openenings[openenings.length - 1].matches : currentToken.matches;
                             match = matches.pop();
                             if (match.isAlternator) { //handle quantifier in an alternation [0-9]{2}|[0-9]{3}
-                                matches.push(match);
-                                matches = match.matches;
-                                match = matches.pop();
+                                matches.push(match); //push back alternator
+                                matches = match.matches; //remap target matches
+                                var groupToken = new MaskToken(true);
+                                var tmpMatch = matches.pop();
+                                matches.push(groupToken); //push the group
+                                matches = groupToken.matches;
+                                match = tmpMatch;
                             }
                             if (!match.isGroup) {
                                 if (regexMask && match.fn === null) {
@@ -616,7 +620,7 @@
                 if (opts.numericInput || opts.isRTL) {
                     reverseTokens(maskTokens[0]);
                 }
-                console.log(JSON.stringify(maskTokens));
+                // console.log(JSON.stringify(maskTokens));
                 return maskTokens;
             }
         };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.32",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
   "main": "index.js",
   "files": [

temp.js

@@ -0,0 +1,177 @@
+[{
+    "matches": [{
+        "matches": [{
+            "matches": [{
+                "matches": [{
+                    "fn": {},
+                    "optionality": false,
+                    "newBlockMarker": true,
+                    "casing": null,
+                    "def": "[0-9]",
+                    "nativeDef": "[0-9]"
+                }],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": true,
+                "isOptional": false,
+                "isQuantifier": false,
+                "isAlternator": false,
+                "quantifier": {"min": 1, "max": 1}
+            }, {
+                "matches": [],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": false,
+                "isOptional": false,
+                "isQuantifier": true,
+                "isAlternator": false,
+                "quantifier": {"min": 2, "max": 2}
+            }],
+            "openGroup": false,
+            "alternatorGroup": false,
+            "isGroup": false,
+            "isOptional": false,
+            "isQuantifier": false,
+            "isAlternator": false,
+            "quantifier": {"min": 1, "max": 1}
+        }, {
+            "matches": [{
+                "matches": [{
+                    "fn": {},
+                    "optionality": false,
+                    "newBlockMarker": true,
+                    "casing": null,
+                    "def": "[0-9]",
+                    "nativeDef": "[0-9]"
+                }],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": true,
+                "isOptional": false,
+                "isQuantifier": false,
+                "isAlternator": false,
+                "quantifier": {"min": 1, "max": 1}
+            }, {
+                "matches": [],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": false,
+                "isOptional": false,
+                "isQuantifier": true,
+                "isAlternator": false,
+                "quantifier": {"min": 3, "max": 3}
+            }],
+            "openGroup": false,
+            "alternatorGroup": false,
+            "isGroup": false,
+            "isOptional": false,
+            "isQuantifier": false,
+            "isAlternator": false,
+            "quantifier": {"min": 1, "max": 1}
+        }],
+        "openGroup": false,
+        "alternatorGroup": false,
+        "isGroup": false,
+        "isOptional": false,
+        "isQuantifier": false,
+        "isAlternator": true,
+        "quantifier": {"min": 1, "max": 1}
+    }],
+    "openGroup": false,
+    "alternatorGroup": false,
+    "isGroup": false,
+    "isOptional": false,
+    "isQuantifier": false,
+    "isAlternator": false,
+    "quantifier": {"min": 1, "max": 1}
+}]
+js\inputmask.js
+:
+623 [{
+    "matches": [{
+        "matches": [{
+            "matches": [{
+                "matches": [{
+                    "fn": {},
+                    "optionality": false,
+                    "newBlockMarker": true,
+                    "casing": null,
+                    "def": "[0-9]",
+                    "nativeDef": "[0-9]"
+                }],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": true,
+                "isOptional": false,
+                "isQuantifier": false,
+                "isAlternator": false,
+                "quantifier": {"min": 1, "max": 1}
+            }, {
+                "matches": [],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": false,
+                "isOptional": false,
+                "isQuantifier": true,
+                "isAlternator": false,
+                "quantifier": {"min": 2, "max": 2}
+            }],
+            "openGroup": false,
+            "alternatorGroup": false,
+            "isGroup": false,
+            "isOptional": false,
+            "isQuantifier": false,
+            "isAlternator": false,
+            "quantifier": {"min": 1, "max": 1}
+        }, {
+            "matches": [{
+                "matches": [{
+                    "fn": {},
+                    "optionality": false,
+                    "newBlockMarker": true,
+                    "casing": null,
+                    "def": "[0-9]",
+                    "nativeDef": "[0-9]",
+                    "isGroup": false
+                }],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": true,
+                "isOptional": false,
+                "isQuantifier": false,
+                "isAlternator": false,
+                "quantifier": {"min": 1, "max": 1}
+            }, {
+                "matches": [],
+                "openGroup": false,
+                "alternatorGroup": false,
+                "isGroup": false,
+                "isOptional": false,
+                "isQuantifier": true,
+                "isAlternator": false,
+                "quantifier": {"min": 3, "max": 3}
+            }],
+            "openGroup": true,
+            "alternatorGroup": false,
+            "isGroup": false,
+            "isOptional": false,
+            "isQuantifier": false,
+            "isAlternator": false,
+            "quantifier": {"min": 1, "max": 1}
+        }],
+        "openGroup": false,
+        "alternatorGroup": false,
+        "isGroup": false,
+        "isOptional": false,
+        "isQuantifier": false,
+        "isAlternator": true,
+        "quantifier": {"min": 1, "max": 1}
+    }],
+    "openGroup": false,
+    "alternatorGroup": false,
+    "isGroup": false,
+    "isOptional": false,
+    "isQuantifier": false,
+    "isAlternator": false,
+    "quantifier": {"min": 1, "max": 1}
+}]