Move generated .mjs file to /src

package.json

@@ -142,19 +142,19 @@
   ],  
   "type": "commonjs",
   "main": "src/ua-parser.js",
-  "module": "dist/ua-parser.mjs",
+  "module": "src/ua-parser.mjs",
   "exports": {
       "require": "./src/ua-parser.js",
-      "import": "./dist/ua-parser.mjs"
+      "import": "./src/ua-parser.mjs"
   },
   "files": [
     "dist",
     "src"
   ],
   "scripts": {
-    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle && node -e \"const fs=require('fs');fs.writeFileSync('dist/ua-parser.mjs','// Generated ESM version of UAParser.js\\n// Source file: /src/ua-parser.js\\n\\n'+fs.readFileSync('src/ua-parser.js','utf-8').replace(/\\(func[\\s\\S]+strict\\';/ig,'const window = undefined;').replace(/\\/[\\/\\s]+export[\\s\\S]+/ig,'export {UAParser};'),'utf-8')\"",
+    "build": "uglifyjs src/ua-parser.js -o dist/ua-parser.min.js --comments '/^ UA/' && uglifyjs src/ua-parser.js -o dist/ua-parser.pack.js --comments '/^ UA/' --compress --mangle && node -e \"const fs=require('fs');fs.writeFileSync('src/ua-parser.mjs','// Generated ESM version of UAParser.js\\n// Source file: /src/ua-parser.js\\n\\nconst window = undefined;\\n\\n'+fs.readFileSync('src/ua-parser.js','utf-8').replace(/\\(func[\\s\\S]+strict\\';/ig,'').replace(/\\/[\\/\\s]+export[\\s\\S]+/ig,'export {UAParser};'),'utf-8')\"",
-    "test": "jshint src/ua-parser.js && mocha -R spec test/test.js && mocha -R spec test/es6-test.mjs",
+    "test": "jshint src/ua-parser.js && mocha -R nyan test",
-    "test-ci": "jshint src/ua-parser.js && mocha -R spec test/test.js",
+    "test-ci": "jshint src/ua-parser.js && mocha -R spec test",
     "verup": "node ./node_modules/verup",
     "version": "node ./node_modules/verup 0"
   },

src/ua-parser.mjs

@@ -1,6 +1,8 @@
 // Generated ESM version of UAParser.js
 // Source file: /src/ua-parser.js
 
+const window = undefined;
+
 /////////////////////////////////////////////////////////////////////////////////
 /* UAParser.js v1.1.34
    Copyright © 2012-2023 Faisal Salman <f@faisalman.com>
@@ -11,7 +13,7 @@
    Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////
 
-const window = undefined;
+
 
     //////////////
     // Constants
@@ -59,9 +61,8 @@ const window = undefined;
         UA_DEVICE   = 'device',
         UA_ENGINE   = 'engine',
         UA_OS       = 'os',
-        UA_RESULT   = 'result';
+        UA_RESULT   = 'result',
-
+        AMAZON      = 'Amazon',
-    var AMAZON  = 'Amazon',
         APPLE       = 'Apple',
         ASUS        = 'ASUS',
         BLACKBERRY  = 'BlackBerry',
@@ -77,14 +78,13 @@ const window = undefined;
         XIAOMI      = 'Xiaomi',
         ZEBRA       = 'Zebra',
         ZTE         = 'ZTE',
-
+        PREFIX_MOBILE  = 'Mobile ',
-        BROWSER = 'Browser',
+        SUFFIX_BROWSER = ' Browser',
         CHROME      = 'Chrome',
         EDGE        = 'Edge',
         FIREFOX     = 'Firefox',
         OPERA       = 'Opera',
         FACEBOOK    = 'Facebook',
-
         WINDOWS     = 'Windows';
    
     var NAVIGATOR           = (typeof window !== UNDEF_TYPE && window.navigator) ? 
@@ -98,7 +98,18 @@ const window = undefined;
     // Helper
     //////////
 
-    var extend = function (regexes, extensions) {
+    var assignFromEntries = function (arr) {
+            for (var i in arr) {
+                var propName = arr[i];
+                if (typeof propName == OBJ_TYPE && propName.length == 2) {
+                    this[propName[0]] = propName[1];
+                } else {
+                    this[propName] = undefined;
+                }
+            }
+            return this;
+        },
+        extend = function (regexes, extensions) {
             var mergedRegexes = {};
             for (var i in regexes) {
                 mergedRegexes[i] = extensions[i] && extensions[i].length % 2 === 0 ? extensions[i].concat(regexes[i]) : regexes[i];
@@ -113,19 +124,14 @@ const window = undefined;
             return enums;
         },
         has = function (str1, str2) {
+            if (typeof str1 === OBJ_TYPE && str1.length > 0) {
+                for (var i in str1) {
+                    if (lowerize(str1[i]) == lowerize(str2)) return true;
+                }
+                return false;
+            }
             return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
         },
-        initialize = function (arr) {
-            for (var i in arr) {
-                var propName = arr[i];
-                if (typeof propName == OBJ_TYPE && propName.length == 2) {
-                    this[propName[0]] = propName[1];
-                } else {
-                    this[propName] = undefined;
-                }
-            }
-            return this;
-        },
         isExtensions = function (obj) {
             for (var prop in obj) {
                 return /^(browser|cpu|device|engine|os)$/.test(prop);
@@ -141,8 +147,8 @@ const window = undefined;
             }
             return arr;
         },
-        lowerize = function (str, rgx) {
+        lowerize = function (str) {
-            return typeof(str) === STR_TYPE ? strip((rgx ? new RegExp(rgx, 'i') : EMPTY), str.toLowerCase()) : str;
+            return typeof(str) === STR_TYPE ? str.toLowerCase() : str;
         },
         majorize = function (version) {
             return typeof(version) === STR_TYPE ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
@@ -273,12 +279,13 @@ const window = undefined;
     // Regex map
     /////////////
 
-    var regexes = {
+    var defaultRegexes = {
 
         browser : [[
 
+            // Most common regardless engine
             /\b(?:crmo|crios)\/([\w\.]+)/i                                      // Chrome for Android/iOS
-            ], [VERSION, [NAME, 'Chrome']], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
             /edg(?:e|ios|a)?\/([\w\.]+)/i                                       // Microsoft Edge
             ], [VERSION, [NAME, 'Edge']], [
 
@@ -302,11 +309,12 @@ const window = undefined;
 
             // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
             /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
-                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
+                                                                                // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo
+            /(heytap|ovi)browser\/([\d\.]+)/i,                                  // HeyTap/Ovi
             /(weibo)__([\d\.]+)/i                                               // Weibo
             ], [NAME, VERSION], [
             /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i                 // UCBrowser
-            ], [VERSION, [NAME, 'UC'+BROWSER]], [
+            ], [VERSION, [NAME, 'UCBrowser']], [
             /microm.+\bqbcore\/([\w\.]+)/i,                                     // WeChat Desktop for Windows Built-in Browser
             /\bqbcore\/([\w\.]+).+microm/i
             ], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
@@ -316,10 +324,10 @@ const window = undefined;
             ], [VERSION, [NAME, 'Konqueror']], [
             /trident.+rv[: ]([\w\.]{1,9})\b.+like gecko/i                       // IE11
             ], [VERSION, [NAME, 'IE']], [
-            /yabrowser\/([\w\.]+)/i                                             // Yandex
+            /ya(?:search)?browser\/([\w\.]+)/i                                  // Yandex
             ], [VERSION, [NAME, 'Yandex']], [
             /(avast|avg)\/([\w\.]+)/i                                           // Avast/AVG Secure Browser
-            ], [[NAME, /(.+)/, '$1 Secure '+BROWSER], VERSION], [
+            ], [[NAME, /(.+)/, '$1 Secure' + SUFFIX_BROWSER], VERSION], [
             /\bfocus\/([\w\.]+)/i                                               // Firefox Focus
             ], [VERSION, [NAME, FIREFOX+' Focus']], [
             /\bopt\/([\w\.]+)/i                                                 // Opera Touch
@@ -331,13 +339,13 @@ const window = undefined;
             /coast\/([\w\.]+)/i                                                 // Opera Coast
             ], [VERSION, [NAME, OPERA+' Coast']], [
             /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
-            ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
+            ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
-            /fxios\/([-\w\.]+)/i                                                // Firefox for iOS
+            /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, FIREFOX]], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Firefox']], [
             /\bqihu|(qi?ho?o?|360)browser/i                                     // 360
-            ], [[NAME, '360 '+BROWSER]], [
+            ], [[NAME, '360' + SUFFIX_BROWSER]], [
             /(oculus|samsung|sailfish|huawei)browser\/([\w\.]+)/i
-            ], [[NAME, /(.+)/, '$1 '+BROWSER], VERSION], [                      // Oculus/Samsung/Sailfish/Huawei Browser
+            ], [[NAME, /(.+)/, '$1' + SUFFIX_BROWSER], VERSION], [               // Oculus/Samsung/Sailfish/Huawei Browser
             /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
             ], [[NAME, /_/g, ' '], VERSION], [
             /(electron)\/([\w\.]+) safari/i,                                    // Electron-based App
@@ -368,14 +376,19 @@ const window = undefined;
             ], [[NAME, CHROME+' WebView'], VERSION], [
 
             /droid.+ version\/([\w\.]+)\b.+(?:mobile safari|safari)/i           // Android Browser
-            ], [VERSION, [NAME, 'Android '+BROWSER]], [
+            ], [VERSION, [NAME, 'Android' + SUFFIX_BROWSER]], [
+
+            /chrome\/([\w\.]+) mobile/i                                         // Chrome Mobile
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Chrome']], [
 
             /(chrome|omniweb|arora|[tizenoka]{5} ?browser)\/v?([\w\.]+)/i       // Chrome/OmniWeb/Arora/Tizen/Nokia
             ], [NAME, VERSION], [
 
-            /version\/([\w\.\,]+) .*mobile\/\w+ (safari)/i                      // Mobile Safari
+            /version\/([\w\.\,]+) .*mobile(?:\/\w+ | ?)safari/i                 // Safari Mobile
-            ], [VERSION, [NAME, 'Mobile Safari']], [
+            ], [VERSION, [NAME, PREFIX_MOBILE + 'Safari']], [
-            /version\/([\w(\.|\,)]+) .*(mobile ?safari|safari)/i                // Safari & Safari Mobile
+            /iphone .*mobile(?:\/\w+ | ?)safari/i
+            ], [[NAME, PREFIX_MOBILE + 'Safari']], [
+            /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
             ], [VERSION, NAME], [
             /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
             ], [NAME, [VERSION, strMapper, oldSafariMap]], [
@@ -384,6 +397,8 @@ const window = undefined;
             ], [NAME, VERSION], [
 
             // Gecko based
+            /(?:mobile|tablet);.*(firefox)\/([\w\.-]+)/i                        // Firefox Mobile
+            ], [[NAME, PREFIX_MOBILE + 'Firefox'], VERSION], [
             /(navigator|netscape\d?)\/([-\w\.]+)/i                              // Netscape
             ], [[NAME, 'Netscape'], VERSION], [
             /mobile vr; rv:([\w\.]+)\).+firefox/i                               // Firefox Reality
@@ -453,7 +468,7 @@ const window = undefined;
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
 
             // Apple
-            /\((ip(?:hone|od)[\w ]*);/i                                         // iPod/iPhone
+            /(?:\/|\()(ip(?:hone|od)[\w, ]*)(?:\/|;)/i                          // iPod/iPhone
             ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
             /\((ipad);[-\w\),; ]+apple/i,                                       // iPad
             /applecoremedia\/[\w\.]+ \((ipad)/i,
@@ -543,7 +558,7 @@ const window = undefined;
 
             // Amazon
             /(alexa)webm/i,
-            /(kf[a-z]{2}wi)( bui|\))/i,                                         // Kindle Fire without Silk
+            /(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i,                             // Kindle Fire without Silk / Echo Show
             /(kf[a-z]+)( bui|\)).+silk\//i                                      // Kindle Fire HD
             ], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
             /((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i                     // Fire Phone
@@ -728,6 +743,8 @@ const window = undefined;
 
             /(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i                              // Tesla
             ], [VENDOR, [TYPE, EMBEDDED]], [
+            /(aeobc)\b/i                                                        // Echo Dot
+            ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
 
             ////////////////////
             // MIXED (GENERIC)
@@ -778,6 +795,7 @@ const window = undefined;
 
             // iOS/macOS
             /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
+            /ios;fbsv\/([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -841,115 +859,68 @@ const window = undefined;
     };
 
     /////////////////
-    // Constructor
+    // Factories
     ////////////////
 
-    function UAParserDataCH (uach, isHTTP_UACH) {
+    var defaultProps = (function () {
-        uach = uach || {};
+            var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
-        initialize.call(this, CH_ALL_VALUES);
+            assignFromEntries.call(props.init, [
-        if (isHTTP_UACH) {
+                [UA_BROWSER, [NAME, VERSION, MAJOR]],
-            initialize.call(this, [
+                [UA_CPU, [ARCHITECTURE]],
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
+                [UA_DEVICE, [TYPE, MODEL, VENDOR]],
-                [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
+                [UA_ENGINE, [NAME, VERSION]],
-                [BRANDS, itemListToArray(uach[CH_HEADER])],
+                [UA_OS, [NAME, VERSION]]
-                [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
-                [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
-                [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
-                [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
-                [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
-                [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
             ]);
-        } else {
+            assignFromEntries.call(props.isIgnore, [
-            for (var prop in uach) {
+                [UA_BROWSER, [VERSION, MAJOR]],
-                if(this.hasOwnProperty(prop) && uach[prop]) this[prop] = stripQuotes(uach[prop]);
+                [UA_ENGINE, [VERSION]],
-            }
+                [UA_OS, [VERSION]]
-        }
+            ]);
-        return this;
+            assignFromEntries.call(props.isIgnoreRgx, [
-    }
+                [UA_BROWSER, / ?browser$/i],
+                [UA_OS, / ?os$/i]
+            ]);
+            assignFromEntries.call(props.toString, [
+                [UA_BROWSER, [NAME, VERSION]],
+                [UA_CPU, [ARCHITECTURE]],
+                [UA_DEVICE, [VENDOR, MODEL]],
+                [UA_ENGINE, [NAME, VERSION]],
+                [UA_OS, [NAME, VERSION]]
+            ]);
+            return props;
+    })();
 
-    function UAParserItem (data) {
+    var createUAParserData = function (itemType, ua, rgxMap, uaCH) {
-        if (!data) return;
+
-        this.ua = data[0];
+        var init_props = defaultProps.init[itemType],
-        this.uaCH = data[1];
+            is_ignoreProps = defaultProps.isIgnore[itemType] || 0,
-        this.rgxMap = data[3];
+            is_ignoreRgx = defaultProps.isIgnoreRgx[itemType] || 0,
-        this.data = (function (data) {
+            toString_props = defaultProps.toString[itemType] || 0;
-            var ua = data[0],
-                uaCH = data[1],
-                itemType = data[2],
-                rgxMap = data[3],
-                init_props = data[4],
-                is_ignoreProps = data[5],
-                is_ignoreRgx = data[6],
-                toString_props = data[7];
 
         function UAParserData () {
-                initialize.call(this, init_props);
+            assignFromEntries.call(this, init_props);
         }
         UAParserData.prototype.withClientHints = function () {
             
             // nodejs / non-client-hints browsers
             if (!NAVIGATOR_UADATA) {
-
+                return new UAParserItem(itemType, ua, rgxMap, uaCH).parseCH().get();
-                    var HTTP_UACH = uaCH;
-                    switch (itemType) {
-                        case UA_BROWSER:
-                            return new UAParserBrowser(ua, rgxMap, HTTP_UACH).parseCH().get();
-                        case UA_CPU:
-                            return new UAParserCPU(ua, rgxMap, HTTP_UACH).parseCH().get();
-                        case UA_DEVICE:
-                            return new UAParserDevice(ua, rgxMap, HTTP_UACH).parseCH().get();
-                        case UA_ENGINE:
-                            return new UAParserEngine(ua, rgxMap).get();
-                        case UA_OS:
-                            return new UAParserOS(ua, rgxMap, HTTP_UACH).parseCH().get();
-                        default :
-                            return new UAParserResult(ua, rgxMap, HTTP_UACH)
-                                        .set('ua', ua)
-                                        .set('ua_ch', uaCH)
-                                        .set(UA_BROWSER, new UAParserBrowser(ua, rgxMap[UA_BROWSER], HTTP_UACH).parseCH().get())
-                                        .set(UA_CPU, new UAParserCPU(ua, rgxMap[UA_CPU], HTTP_UACH).parseCH().get())
-                                        .set(UA_DEVICE, new UAParserDevice(ua, rgxMap[UA_DEVICE], HTTP_UACH).parseCH().get())
-                                        .set(UA_ENGINE, new UAParserEngine(ua, rgxMap[UA_ENGINE]).get())
-                                        .set(UA_OS, new UAParserOS(ua, rgxMap[UA_OS], HTTP_UACH).parseCH().get())
-                                        .get();
-                    }
             }
 
             // browsers based on chromium 85+
             return NAVIGATOR_UADATA
                     .getHighEntropyValues(CH_ALL_VALUES)
                     .then(function (res) {
-
                         var JS_UACH = new UAParserDataCH(res, false);
-                            switch (itemType) {
+                        return new UAParserItem(itemType, ua, rgxMap, JS_UACH).parseCH().get();
-                                case UA_BROWSER:
-                                    return UAParserBrowser(ua, rgxMap, JS_UACH).parseCH().get();
-                                case UA_CPU:
-                                    return new UAParserCPU(ua, rgxMap, JS_UACH).parseCH().get();
-                                case UA_DEVICE:
-                                    return new UAParserDevice(ua, rgxMap, JS_UACH).parseCH().get();
-                                case UA_ENGINE:
-                                    return new UAParserEngine(ua, rgxMap).get();
-                                case UA_OS:
-                                    return new UAParserOS(ua, rgxMap, JS_UACH).parseCH().get();
-                                default :
-                                    return new UAParserResult(ua, rgxMap, JS_UACH)
-                                                .set('ua', ua)
-                                                .set('ua_ch', JS_UACH)
-                                                .set(UA_BROWSER, new UAParserBrowser(ua, rgxMap[UA_BROWSER], JS_UACH).parseCH().get())
-                                                .set(UA_CPU, new UAParserCPU(ua, rgxMap[UA_CPU], JS_UACH).parseCH().get())
-                                                .set(UA_DEVICE, new UAParserDevice(ua, rgxMap[UA_DEVICE], JS_UACH).parseCH().get())
-                                                .set(UA_ENGINE, new UAParserEngine(ua, rgxMap[UA_ENGINE]).get())
-                                                .set(UA_OS, new UAParserOS(ua, rgxMap[UA_OS], JS_UACH).parseCH().get())
-                                                .get();
-                            }
             });
         };
+
         if (itemType != UA_RESULT) {
             UAParserData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
-                        if (this.hasOwnProperty(i) && !is_ignoreProps[i] && lowerize(this[i], is_ignoreRgx) === lowerize(strToCheck, is_ignoreRgx)) {
+                    if (this.hasOwnProperty(i) && !has(is_ignoreProps, i) && lowerize(is_ignoreRgx ? strip(is_ignoreRgx, this[i]) : this[i]) == lowerize(is_ignoreRgx ? strip(is_ignoreRgx, strToCheck) : strToCheck)) {
                         is = true;
                         if (strToCheck != UNDEF_TYPE) break;
                     } else if (strToCheck == UNDEF_TYPE && is) {
@@ -966,52 +937,112 @@ const window = undefined;
                         str += (str ? ' ' : EMPTY) + this[toString_props[i]];
                     }
                 }
-                    return str ? str : UNDEF_TYPE;
+                return str || UNDEF_TYPE;
             };
         }
+
         if (!NAVIGATOR_UADATA) {
             UAParserData.prototype.then = function (cb) { 
                 cb(this);
                 return this;
             };
         }
+
         return new UAParserData();
-        })(data);
+    };
+
+    /////////////////
+    // Constructor
+    ////////////////
+
+    function UAParserDataCH (uach, isHTTP_UACH) {
+        uach = uach || {};
+        assignFromEntries.call(this, CH_ALL_VALUES);
+        if (isHTTP_UACH) {
+            assignFromEntries.call(this, [
+                [BRANDS, itemListToArray(uach[CH_HEADER])],
+                [FULLVERLIST, itemListToArray(uach[CH_HEADER_FULL_VER_LIST])],
+                [BRANDS, itemListToArray(uach[CH_HEADER])],
+                [MOBILE, /\?1/.test(uach[CH_HEADER_MOBILE])],
+                [MODEL, stripQuotes(uach[CH_HEADER_MODEL])],
+                [PLATFORM, stripQuotes(uach[CH_HEADER_PLATFORM])],
+                [PLATFORMVER, stripQuotes(uach[CH_HEADER_PLATFORM_VER])],
+                [ARCHITECTURE, stripQuotes(uach[CH_HEADER_ARCH])],
+                [BITNESS, stripQuotes(uach[CH_HEADER_BITNESS])]
+            ]);
+        } else {
+            for (var prop in uach) {
+                if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
+            }
+        }
+        return this;
+    }
+
+    function UAParserItem (itemType, ua, rgxMap, uaCH) {
+        assignFromEntries.call(this, [
+            ['itemType', itemType],
+            ['ua', ua],
+            ['uaCH', uaCH],
+            ['rgxMap', rgxMap],
+            ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
+        ]);
+        this.parse();
+        switch(this.itemType) {
+            case UA_BROWSER:
+                // Brave-specific detection
+                if (NAVIGATOR && NAVIGATOR.userAgent == ua && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                    this.set(NAME, 'Brave');
+                }
+                this.set(MAJOR, majorize(this.get(VERSION)));
+                break;
+            case UA_DEVICE:
+                if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                    this.set(TYPE, MOBILE);
+                }
+                // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                    this.set(MODEL, 'iPad')
+                        .set(TYPE, TABLET);
+                }
+                break;
+            case UA_OS:
+                if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM] && NAVIGATOR_UADATA[PLATFORM] != 'Unknown') {
+                    this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                }
+                break;
+            case UA_RESULT:
+                var createUAParserItem = function (itemType) {
+                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).get();
+                };
+                this.set('ua', ua)
+                    .set('ua_ch', uaCH)
+                    .set(UA_BROWSER, createUAParserItem(UA_BROWSER))
+                    .set(UA_CPU, createUAParserItem(UA_CPU))
+                    .set(UA_DEVICE, createUAParserItem(UA_DEVICE))
+                    .set(UA_ENGINE, createUAParserItem(UA_ENGINE))
+                    .set(UA_OS, createUAParserItem(UA_OS))
+                    .get();
+        }
+        return this;
     }
     UAParserItem.prototype.get = function (prop) {
         if (!prop) return this.data;
         return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
     };
     UAParserItem.prototype.parse = function () {
+        if (this.itemType != UA_RESULT) {
             rgxMapper.call(this.data, this.ua, this.rgxMap);
+        }
         return this;
     };
-    UAParserItem.prototype.set = function (prop, val) {
+    UAParserItem.prototype.parseCH = function () {
-        this.data[prop] = val;
+        var ua = this.ua,
-        return this;
+            uaCH = this.uaCH,
-    };
+            rgxMap = this.rgxMap;
 
-    function UAParserBrowser (ua, browserMap, uach) {
+        switch (this.itemType) {
-        UAParserItem.call(this, [
+            case UA_BROWSER:
-            ua,
+                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
-            uach,
-            UA_BROWSER,
-            browserMap,
-            [NAME, VERSION, MAJOR],
-            [VERSION, MAJOR],
-            ' ?browser$',
-            [NAME, VERSION]
-        ]);
-        this.parse();
-        // Brave-specific detection
-        if (NAVIGATOR && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-            this.set(NAME, 'Brave');
-        }
-        this.set(MAJOR, majorize(this.get(VERSION)));
-    }
-    UAParserBrowser.prototype = new UAParserItem();
-    UAParserBrowser.prototype.parseCH = function () {
-        var brands = this.uaCH[FULLVERLIST] || this.uaCH[BRANDS];
                 if (brands) {
                     for (var i in brands) {
                         var brandName = brands[i].brand,
@@ -1023,111 +1054,49 @@ const window = undefined;
                         }
                     }
                 }
-        return this;
+                break;
-    };
+            case UA_CPU:
-
+                var archName = uaCH[ARCHITECTURE];
-    function UAParserCPU (ua, cpuMap, uach) {
-        UAParserItem.call(this, [
-            ua,
-            uach,
-            UA_CPU,
-            cpuMap,
-            [ARCHITECTURE],
-            [],
-            null,
-            [ARCHITECTURE]
-        ]);
-        this.parse();
-    }
-    UAParserCPU.prototype = new UAParserItem();
-    UAParserCPU.prototype.parseCH = function () {
-        var archName = this.uaCH[ARCHITECTURE];
                 if (archName) {
-            archName += (archName && this.uaCH[BITNESS] == '64') ? '64' : EMPTY;
+                    if (archName && uaCH[BITNESS] == '64') archName += '64';
-            rgxMapper.call(this.data, archName, this.rgxMap);
+                    rgxMapper.call(this.data, archName + ';', rgxMap);
                 }
-        return this;
+                break;
-    };
+            case UA_DEVICE:
-
+                if (uaCH[MOBILE]) {
-    function UAParserDevice (ua, deviceMap, uach) {
-        UAParserItem.call(this, [
-            ua,
-            uach,
-            UA_DEVICE,
-            deviceMap,
-            [TYPE, MODEL, VENDOR],
-            [],
-            null,
-            [VENDOR, MODEL]
-        ]);
-        this.parse();
-        if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
                     this.set(TYPE, MOBILE);
                 }
-        // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
+                if (uaCH[MODEL]) {
-        if (this.get(NAME) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                    this.set(MODEL, uaCH[MODEL]);
-            this.set(MODEL, 'iPad')
-                .set(TYPE, TABLET);
                 }
-    }
+                break;
-    UAParserDevice.prototype = new UAParserItem();
+            case UA_OS:
-    UAParserDevice.prototype.parseCH = function () {
+                var osName = uaCH[PLATFORM];
-        if (this.uaCH[MOBILE]) {
-            this.set(TYPE, MOBILE);
-        }
-        if (this.uaCH[MODEL]) {
-            this.set(MODEL, this.uaCH[MODEL]);
-        }
-        return this;
-    };
-
-    function UAParserEngine (ua, engineMap) {
-        UAParserItem.call(this, [
-            ua,
-            null,
-            UA_ENGINE,
-            engineMap,
-            [NAME, VERSION],
-            [VERSION],
-            null,
-            [NAME, VERSION]
-        ]);
-        this.parse();
-    }
-    UAParserEngine.prototype = new UAParserItem();
-
-    function UAParserOS (ua, osMap, uach) {
-        UAParserItem.call(this, [
-            ua,
-            uach,
-            UA_OS,
-            osMap,
-            [NAME, VERSION],
-            [VERSION],
-            ' ?os$',
-            [NAME, VERSION]
-        ]);
-        this.parse();
-        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM] && NAVIGATOR_UADATA[PLATFORM] != 'Unknown') {
-            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
-        }
-    }
-    UAParserOS.prototype = new UAParserItem();
-    UAParserOS.prototype.parseCH = function () {
-        var osName = this.uaCH[PLATFORM];
                 if(osName) {
-            var osVersion = this.uaCH[PLATFORMVER];
+                    var osVersion = uaCH[PLATFORMVER];
-            osVersion = (osName == WINDOWS) ? (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10') : osVersion;
+                    if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
                     this.set(NAME, osName)
                         .set(VERSION, osVersion);
                 }
+                break;
+            case UA_RESULT:
+                var createUAParserItemWithCH = function (itemType) {
+                    return new UAParserItem(itemType, ua, rgxMap[itemType], uaCH).parseCH().get();
+                };
+                this.set('ua', ua)
+                    .set('ua_ch', uaCH)
+                    .set(UA_BROWSER, createUAParserItemWithCH(UA_BROWSER))
+                    .set(UA_CPU, createUAParserItemWithCH(UA_CPU))
+                    .set(UA_DEVICE, createUAParserItemWithCH(UA_DEVICE))
+                    .set(UA_ENGINE, createUAParserItemWithCH(UA_ENGINE))
+                    .set(UA_OS, createUAParserItemWithCH(UA_OS));
+        }
+        return this;
+    };
+    UAParserItem.prototype.set = function (prop, val) {
+        this.data[prop] = val;
         return this;
     };
-
-    function UAParserResult (ua, resMap, uach) {
-        UAParserItem.call(this, [ua, uach, UA_RESULT, resMap]);
-    }
-    UAParserResult.prototype = new UAParserItem();
 
     function UAParser (ua, extensions, headers) {
 
@@ -1161,52 +1130,29 @@ const window = undefined;
             HTTP_UACH = new UAParserDataCH(headers, true),
 
             regexMap = extensions ? 
-                        extend(regexes, extensions) : 
+                        extend(defaultRegexes, extensions) : 
-                        regexes;
+                        defaultRegexes,
+
+            createUAParserItemFunc = function (itemType) {
+                return function () {
+                    return new UAParserItem(itemType, userAgent, itemType == UA_RESULT ? regexMap : regexMap[itemType], HTTP_UACH).get();
+                };
+            };
 
         // public methods
-        this.getBrowser = function () {
+        assignFromEntries.call(this, [
-            return new UAParserBrowser(userAgent, regexMap[UA_BROWSER], HTTP_UACH).get();
+            ['getBrowser', createUAParserItemFunc(UA_BROWSER)],
-        };
+            ['getCPU', createUAParserItemFunc(UA_CPU)],
-        
+            ['getDevice', createUAParserItemFunc(UA_DEVICE)],
-        this.getCPU = function () {
+            ['getEngine', createUAParserItemFunc(UA_ENGINE)],
-            return new UAParserCPU(userAgent, regexMap[UA_CPU], HTTP_UACH).get();
+            ['getOS', createUAParserItemFunc(UA_OS)],
-        };
+            ['getResult', createUAParserItemFunc(UA_RESULT)],
-
+            ['getUA', function () { return userAgent; }],
-        this.getDevice = function () {
+            ['setUA', function (ua) {
-            return new UAParserDevice(userAgent, regexMap[UA_DEVICE], HTTP_UACH).get();
-        };
-
-        this.getEngine = function () {
-            return new UAParserEngine(userAgent, regexMap[UA_ENGINE]).get();
-        };
-
-        this.getOS = function () {
-            return new UAParserOS(userAgent, regexMap[UA_OS], HTTP_UACH).get();
-        };
-
-        this.getResult = function () {
-            return new UAParserResult(userAgent, regexMap, HTTP_UACH)
-                        .set('ua', userAgent)
-                        .set('ua_ch', HTTP_UACH)
-                        .set(UA_BROWSER, this.getBrowser())
-                        .set(UA_CPU, this.getCPU())
-                        .set(UA_DEVICE, this.getDevice())
-                        .set(UA_ENGINE, this.getEngine())
-                        .set(UA_OS, this.getOS())
-                        .get();
-        };
-
-        this.getUA = function () {
-            return userAgent;
-        };
-
-        this.setUA = function (ua) {
                 userAgent = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
                 return this;
-        };
+            }]
-
+        ]).setUA(userAgent);
-        this.setUA(userAgent);
         return this;
     }
 

test/es6-test.mjs

@@ -1,4 +1,4 @@
-import { UAParser } from '../dist/ua-parser.mjs'
+import { UAParser } from '../src/ua-parser.mjs'
 import * as assert from 'assert'
 
 describe('Returns', () => {