ua-parser-js 2.0.0-alpha.2 → 2.0.0-alpha.3

package/src/{ua-parser.mjs → main/ua-parser.mjs}

@@ -1,11 +1,9 @@
-// Generated ESM version of UAParser.js
+// Generated ESM version of UAParser.js 
 // DO NOT EDIT THIS FILE!
-// Source: /src/ua-parser.js
-
-const window = undefined;
+// Source: /src/main/ua-parser.js
 
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-alpha.2
+/* UAParser.js v2.0.0-alpha.3
    Copyright © 2012-2023 Faisal Salman <f@faisalman.com>
    MIT License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -14,14 +12,17 @@ const window = undefined;
    Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////
 
+/* jshint esversion: 6 */ 
+/* globals window */
 
 
+    
     //////////////
     // Constants
     /////////////
 
 
-    var LIBVERSION  = '2.0.0-alpha.2',
+    var LIBVERSION  = '2.0.0-alpha.3',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -51,12 +52,12 @@ const window = undefined;
         CH_HEADER   = 'sec-ch-ua',
         CH_HEADER_FULL_VER_LIST = CH_HEADER + '-full-version-list',
         CH_HEADER_ARCH      = CH_HEADER + '-arch',
-        CH_HEADER_BITNESS   = CH_HEADER + '-bitness',
-        CH_HEADER_MOBILE    = CH_HEADER + '-mobile',
-        CH_HEADER_MODEL     = CH_HEADER + '-model',
-        CH_HEADER_PLATFORM  = CH_HEADER + '-platform',
+        CH_HEADER_BITNESS   = CH_HEADER + '-' + BITNESS,
+        CH_HEADER_MOBILE    = CH_HEADER + '-' + MOBILE,
+        CH_HEADER_MODEL     = CH_HEADER + '-' + MODEL,
+        CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
         CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
-        CH_ALL_VALUES       = ['brands', 'fullVersionList', MOBILE, MODEL, 'platform', 'platformVersion', ARCHITECTURE, 'bitness'],
+        CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, BITNESS],
         UA_BROWSER  = 'browser',
         UA_CPU      = 'cpu',
         UA_DEVICE   = 'device',
@@ -97,18 +98,7 @@ const window = undefined;
     // Helper
     //////////
 
-    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 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];
@@ -152,6 +142,17 @@ const window = undefined;
         majorize = function (version) {
             return typeof(version) === STR_TYPE ? strip(/[^\d\.]/g, version).split('.')[0] : undefined;
         },
+        setProps = 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;
+        },
         strip = function (pattern, str) {
             return str.replace(pattern, EMPTY);
         },
@@ -245,18 +246,7 @@ const window = undefined;
     // String map
     //////////////
 
-    // Safari < 3.0
-    var oldSafariMap = {
-            '1.0'   : '/8',
-            '1.2'   : '/1',
-            '1.3'   : '/3',
-            '2.0'   : '/412',
-            '2.0.2' : '/416',
-            '2.0.3' : '/417',
-            '2.0.4' : '/419',
-            '?'     : '/'
-        },
-        windowsVersionMap = {
+    var windowsVersionMap = {
             'ME'        : '4.90',
             'NT 3.11'   : 'NT3.51',
             'NT 4.0'    : 'NT4.0',
@@ -359,7 +349,7 @@ const window = undefined;
             /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
-            /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
+            /(chromium|instagram|snapchat)[\/ ]([-\w\.]+)/i                     // Chromium/Instagram/Snapchat
             ], [NAME, VERSION], [
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
             ], [VERSION, [NAME, 'GSA']], [
@@ -388,7 +378,7 @@ const window = undefined;
             /version\/([\w\.\,]+) .*(safari)/i                                  // Safari
             ], [VERSION, NAME], [
             /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i                      // Safari < 3.0
-            ], [NAME, [VERSION, strMapper, oldSafariMap]], [
+            ], [NAME, [VERSION, '1']], [
 
             /(webkit|khtml)\/([\w\.]+)/i
             ], [NAME, VERSION], [
@@ -429,7 +419,7 @@ const window = undefined;
             /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
             ], [[ARCHITECTURE, 'ia32']], [
 
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                 // ARM64
+            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                  // ARM64
             ], [[ARCHITECTURE, 'arm64']], [
 
             /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
@@ -486,7 +476,7 @@ const window = undefined;
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
-            /\b(poco[\w ]+)(?: bui|\))/i,                                       // Xiaomi POCO
+            /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
             /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
@@ -594,7 +584,7 @@ const window = undefined;
             ], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
 
             // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(asus)-?(\w+)/i,                                                   // Asus
@@ -639,7 +629,7 @@ const window = undefined;
             ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
             /crkey/i                                                            // Google Chromecast
             ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
-            /droid.+aft(\w)( bui|\))/i                                          // Fire TV
+            /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i,
             /(aquos-tv[\w ]+)\)/i                                               // Sharp
@@ -744,7 +734,7 @@ const window = undefined;
 
             // iOS/macOS
             /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
-            /ios;fbsv\/([\d\.]+)/i,
+            /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
             /(mac os x) ?([\w\. ]*)/i,
@@ -813,23 +803,23 @@ const window = undefined;
 
     var defaultProps = (function () {
             var props = { init : {}, isIgnore : {}, isIgnoreRgx : {}, toString : {}};
-            assignFromEntries.call(props.init, [
+            setProps.call(props.init, [
                 [UA_BROWSER, [NAME, VERSION, MAJOR]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [TYPE, MODEL, VENDOR]],
                 [UA_ENGINE, [NAME, VERSION]],
                 [UA_OS, [NAME, VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnore, [
+            setProps.call(props.isIgnore, [
                 [UA_BROWSER, [VERSION, MAJOR]],
                 [UA_ENGINE, [VERSION]],
                 [UA_OS, [VERSION]]
             ]);
-            assignFromEntries.call(props.isIgnoreRgx, [
+            setProps.call(props.isIgnoreRgx, [
                 [UA_BROWSER, / ?browser$/i],
                 [UA_OS, / ?os$/i]
             ]);
-            assignFromEntries.call(props.toString, [
+            setProps.call(props.toString, [
                 [UA_BROWSER, [NAME, VERSION]],
                 [UA_CPU, [ARCHITECTURE]],
                 [UA_DEVICE, [VENDOR, MODEL]],
@@ -839,34 +829,47 @@ const window = undefined;
             return props;
     })();
 
-    var createUAParserData = function (itemType, ua, rgxMap, uaCH) {
+    var createIData = function (item, itemType) {
 
         var init_props = defaultProps.init[itemType],
             is_ignoreProps = defaultProps.isIgnore[itemType] || 0,
             is_ignoreRgx = defaultProps.isIgnoreRgx[itemType] || 0,
             toString_props = defaultProps.toString[itemType] || 0;
 
-        function UAParserData () {
-            assignFromEntries.call(this, init_props);
+        function IData () {
+            setProps.call(this, init_props);
         }
-        UAParserData.prototype.withClientHints = function () {
-            
+
+        IData.prototype.getItem = function () {
+            return item;
+        };
+
+        IData.prototype.withClientHints = function () {
+
             // nodejs / non-client-hints browsers
             if (!NAVIGATOR_UADATA) {
-                return new UAParserItem(itemType, ua, rgxMap, uaCH).parseCH().get();
+                return item
+                        .parseCH()
+                        .get();
             }
 
             // browsers based on chromium 85+
             return NAVIGATOR_UADATA
                     .getHighEntropyValues(CH_ALL_VALUES)
                     .then(function (res) {
-                        var JS_UACH = new UAParserDataCH(res, false);
-                        return new UAParserItem(itemType, ua, rgxMap, JS_UACH).parseCH().get();
+                        return item
+                                .setCH(new UACHData(res, false))
+                                .parseCH()
+                                .get();
             });
         };
 
+        IData.prototype.withFeatureCheck = function () {
+            return item.detectFeature().get();
+        };
+
         if (itemType != UA_RESULT) {
-            UAParserData.prototype.is = function (strToCheck) {
+            IData.prototype.is = function (strToCheck) {
                 var is = false;
                 for (var i in this) {
                     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)) {
@@ -879,7 +882,7 @@ const window = undefined;
                 }
                 return is;
             };
-            UAParserData.prototype.toString = function () {
+            IData.prototype.toString = function () {
                 var str = EMPTY;
                 for (var i in toString_props) {
                     if (typeof(this[toString_props[i]]) !== UNDEF_TYPE) {
@@ -891,40 +894,39 @@ const window = undefined;
         }
 
         if (!NAVIGATOR_UADATA) {
-            UAParserData.prototype.then = function (cb) { 
+            IData.prototype.then = function (cb) { 
                 var that = this;
-                var UAParserDataResolve = function () {
+                var IDataResolve = function () {
                     for (var prop in that) {
                         if (that.hasOwnProperty(prop)) {
                             this[prop] = that[prop];
                         }
                     }
                 };
-                UAParserDataResolve.prototype = {
-                    is : UAParserData.prototype.is,
-                    toString : UAParserData.prototype.toString
+                IDataResolve.prototype = {
+                    is : IData.prototype.is,
+                    toString : IData.prototype.toString
                 };
-                var resolveData = new UAParserDataResolve();
+                var resolveData = new IDataResolve();
                 cb(resolveData);
                 return resolveData;
             };
         }
 
-        return new UAParserData();
+        return new IData();
     };
 
     /////////////////
     // Constructor
     ////////////////
 
-    function UAParserDataCH (uach, isHTTP_UACH) {
+    function UACHData (uach, isHttpUACH) {
         uach = uach || {};
-        assignFromEntries.call(this, CH_ALL_VALUES);
-        if (isHTTP_UACH) {
-            assignFromEntries.call(this, [
+        setProps.call(this, CH_ALL_VALUES);
+        if (isHttpUACH) {
+            setProps.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])],
@@ -937,127 +939,151 @@ const window = undefined;
                 if(this.hasOwnProperty(prop) && typeof uach[prop] !== UNDEF_TYPE) this[prop] = uach[prop];
             }
         }
-        return this;
     }
 
-    function UAParserItem (itemType, ua, rgxMap, uaCH) {
-        assignFromEntries.call(this, [
+    function UAItem (itemType, ua, rgxMap, uaCH) {
+
+        this.get = function (prop) {
+            if (!prop) return this.data;
+            return this.data.hasOwnProperty(prop) ? this.data[prop] : undefined;
+        };
+
+        this.set = function (prop, val) {
+            this.data[prop] = val;
+            return this;
+        };
+
+        this.setCH = function (ch) {
+            this.uaCH = ch;
+            return this;
+        };
+
+        this.detectFeature = function () {
+            if (NAVIGATOR && NAVIGATOR.userAgent == this.ua) {
+                switch (this.itemType) {
+                    case UA_BROWSER:
+                        // Brave-specific detection
+                        if (NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                            this.set(NAME, 'Brave');
+                        }
+                        break;
+                    case UA_DEVICE:
+                        // Chrome-specific detection: check for 'mobile' value of navigator.userAgentData
+                        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:
+                        // Chrome-specific detection: check for 'platform' value of navigator.userAgentData
+                        if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
+                            this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
+                        }
+                        break;
+                    case UA_RESULT:
+                        var data = this.data;
+                        var detect = function (itemType) {
+                            return data[itemType]
+                                    .getItem()
+                                    .detectFeature()
+                                    .get();
+                        };
+                        this.set(UA_BROWSER, detect(UA_BROWSER))
+                            .set(UA_CPU, detect(UA_CPU))
+                            .set(UA_DEVICE, detect(UA_DEVICE))
+                            .set(UA_ENGINE, detect(UA_ENGINE))
+                            .set(UA_OS, detect(UA_OS));
+                }
+            }
+            return this;
+        };
+
+        this.parseUA = function () {
+            if (this.itemType != UA_RESULT) {
+                rgxMapper.call(this.data, this.ua, this.rgxMap);
+            }
+            if (this.itemType == UA_BROWSER) {
+                this.set(MAJOR, majorize(this.get(VERSION)));
+            }
+            return this;
+        };
+
+        this.parseCH = function () {
+            var ua = this.ua,
+                uaCH = this.uaCH,
+                rgxMap = this.rgxMap;
+    
+            switch (this.itemType) {
+                case UA_BROWSER:
+                    var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
+                    if (brands) {
+                        for (var i in brands) {
+                            var brandName = brands[i].brand,
+                                brandVersion = brands[i].version;
+                            if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
+                                this.set(NAME, strip(GOOGLE+' ', brandName))
+                                    .set(VERSION, brandVersion)
+                                    .set(MAJOR, majorize(brandVersion));
+                            }
+                        }
+                    }
+                    break;
+                case UA_CPU:
+                    var archName = uaCH[ARCHITECTURE];
+                    if (archName) {
+                        if (archName && uaCH[BITNESS] == '64') archName += '64';
+                        rgxMapper.call(this.data, archName + ';', rgxMap);
+                    }
+                    break;
+                case UA_DEVICE:
+                    if (uaCH[MOBILE]) {
+                        this.set(TYPE, MOBILE);
+                    }
+                    if (uaCH[MODEL]) {
+                        this.set(MODEL, uaCH[MODEL]);
+                    }
+                    break;
+                case UA_OS:
+                    var osName = uaCH[PLATFORM];
+                    if(osName) {
+                        var osVersion = uaCH[PLATFORMVER];
+                        if (osName == WINDOWS) osVersion = (parseInt(majorize(osVersion), 10) >= 13 ? '11' : '10');
+                        this.set(NAME, osName)
+                            .set(VERSION, osVersion);
+                    }
+                    break;
+                case UA_RESULT:
+                    var data = this.data;
+                    var parse = function (itemType) {
+                        return data[itemType]
+                                .getItem()
+                                .setCH(uaCH)
+                                .parseCH()
+                                .get();
+                    };
+                    this.set(UA_BROWSER, parse(UA_BROWSER))
+                        .set(UA_CPU, parse(UA_CPU))
+                        .set(UA_DEVICE, parse(UA_DEVICE))
+                        .set(UA_ENGINE, parse(UA_ENGINE))
+                        .set(UA_OS, parse(UA_OS));
+            }
+            return this;
+        };
+
+        setProps.call(this, [
             ['itemType', itemType],
             ['ua', ua],
             ['uaCH', uaCH],
             ['rgxMap', rgxMap],
-            ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
+            ['data', createIData(this, itemType)]
         ]);
-        this.parse();
-        var isSelfNav = NAVIGATOR && NAVIGATOR.userAgent == ua;
-        switch(this.itemType) {
-            case UA_BROWSER:
-                // Brave-specific detection
-                if (isSelfNav && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
-                    this.set(NAME, 'Brave');
-                }
-                this.set(MAJOR, majorize(this.get(VERSION)));
-                break;
-            case UA_DEVICE:
-                if (isSelfNav && !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 (isSelfNav && 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 (isSelfNav && !this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
-                    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_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.parseCH = function () {
-        var ua = this.ua,
-            uaCH = this.uaCH,
-            rgxMap = this.rgxMap;
-
-        switch (this.itemType) {
-            case UA_BROWSER:
-                var brands = uaCH[FULLVERLIST] || uaCH[BRANDS];
-                if (brands) {
-                    for (var i in brands) {
-                        var brandName = brands[i].brand,
-                            brandVersion = brands[i].version;
-                        if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
-                            this.set(NAME, strip(GOOGLE+' ', brandName))
-                                .set(VERSION, brandVersion)
-                                .set(MAJOR, majorize(brandVersion));
-                        }
-                    }
-                }
-                break;
-            case UA_CPU:
-                var archName = uaCH[ARCHITECTURE];
-                if (archName) {
-                    if (archName && uaCH[BITNESS] == '64') archName += '64';
-                    rgxMapper.call(this.data, archName + ';', rgxMap);
-                }
-                break;
-            case UA_DEVICE:
-                if (uaCH[MOBILE]) {
-                    this.set(TYPE, MOBILE);
-                }
-                if (uaCH[MODEL]) {
-                    this.set(MODEL, uaCH[MODEL]);
-                }
-                break;
-            case UA_OS:
-                var osName = uaCH[PLATFORM];
-                if(osName) {
-                    var osVersion = uaCH[PLATFORMVER];
-                    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_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 UAParser (ua, extensions, headers) {
 
@@ -1081,39 +1107,54 @@ const window = undefined;
             return new UAParser(ua, extensions, headers).getResult();
         }
 
-        var userAgent = ua || 
-                        ((NAVIGATOR && NAVIGATOR.userAgent) ? 
-                            NAVIGATOR.userAgent : 
-                            (headers && headers[USER_AGENT] ? 
-                                headers[USER_AGENT] : 
-                                EMPTY)),
-            
-            HTTP_UACH = new UAParserDataCH(headers, true),
+        var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
+                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
+                                (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
+                                    EMPTY)),                                                // empty string
 
+            httpUACH = new UACHData(headers, true),
             regexMap = extensions ? 
                         extend(defaultRegexes, extensions) : 
                         defaultRegexes,
 
-            createUAParserItemFunc = function (itemType) {
-                return function () {
-                    return new UAParserItem(itemType, userAgent, itemType == UA_RESULT ? regexMap : regexMap[itemType], HTTP_UACH).get();
-                };
+            createItemFunc = function (itemType) {
+                if (itemType == UA_RESULT) {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap, httpUACH)
+                                    .set('ua', userAgent)
+                                    .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();
+                    };
+                } else {
+                    return function () {
+                        return new UAItem(itemType, userAgent, regexMap[itemType], httpUACH)
+                                    .parseUA()
+                                    .get();
+                    };
+                }
             };
-
+            
         // public methods
-        assignFromEntries.call(this, [
-            ['getBrowser', createUAParserItemFunc(UA_BROWSER)],
-            ['getCPU', createUAParserItemFunc(UA_CPU)],
-            ['getDevice', createUAParserItemFunc(UA_DEVICE)],
-            ['getEngine', createUAParserItemFunc(UA_ENGINE)],
-            ['getOS', createUAParserItemFunc(UA_OS)],
-            ['getResult', createUAParserItemFunc(UA_RESULT)],
+        setProps.call(this, [
+            ['getBrowser', createItemFunc(UA_BROWSER)],
+            ['getCPU', createItemFunc(UA_CPU)],
+            ['getDevice', createItemFunc(UA_DEVICE)],
+            ['getEngine', createItemFunc(UA_ENGINE)],
+            ['getOS', createItemFunc(UA_OS)],
+            ['getResult', createItemFunc(UA_RESULT)],
             ['getUA', function () { return userAgent; }],
             ['setUA', function (ua) {
-                userAgent = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
+                if (typeof ua === STR_TYPE)
+                    userAgent = ua.length > UA_MAX_LENGTH ? trim(ua, UA_MAX_LENGTH) : ua;
                 return this;
             }]
-        ]).setUA(userAgent);
+        ])
+        .setUA(userAgent);
+
         return this;
     }