Now update-profiles.js and update-models.js strip away EN+SPACE chara… (#33)

* Removing Unicode EN+Space for Space

Removing references of u\2002 in data files and unit tests. Originally reported on PHP library WhichBrowser/Parser-PHP#96 - And same PR built for PHP ported to JS library WhichBrowser/Parser-PHP#106

* Removing Unicode EN+Space for Space

Removing references of u\2002 in data files and unit tests. Originally reported on PHP library WhichBrowser/Parser-PHP#96 - And same PR built for PHP ported to JS library WhichBrowser/Parser-PHP#106

* Now update-profiles.js and update-models.js strip away EN+SPACE character  as requested on #32

* Revert changes to data files. These files are automatically generated

Author: mariotsi

bin/update-models.js

@@ -76,6 +76,9 @@ models.forEach((type) => {
       // Remove ] from subgroups
       result = result.replace(/ {2,}],\n/g, '    },\n');
 
+      // Remove occurrences of unicode character 'EN SPACE' (U+2002)
+      result = result.replace(/\u{2002}/gu, ' ');
+
       // Fixing regex eg. /Yahoo\! Mindset/u -> /Yahoo! Mindset/u and /jsRSS++\/([0-9.]*)/u -> /jsRSS\+\+\/([0-9.]*)/u
       // result = result.replace(/\\!/g, '!').replace(/(regexp:\s+?.*?)\+\+(.*?)/g, '$1\\+\\+$2');
 

bin/update-profiles.js

@@ -43,7 +43,10 @@ function escapeString(str) {
   if (!str) {
     return null;
   }
-  return `'${(str + '').replace(/[\\']/g, '\\$&').replace(/\u0000/g, '\\0')}'`;
+  return `'${(str + '')
+    .replace(/[\\']/g, '\\$&')
+    .replace(/\u{0000}/gu, '\\0')
+    .replace(/\u{2002}/gu, ' ')}'`;
 }
 
 /**

data/models-android.js

@@ -291,31 +291,31 @@ exports.WM_MODELS = {
   'HTC v1510': ['Vodafone', 'VPA Compact GPS'],
   'HTC VPACompactIV': ['Vodafone', 'VPA Compact IV'],
 
-  WS003SH: ['Sharp', 'W-ZERO3 WS003SH', { carrier: 'Willcom' }],
-  WS004SH: ['Sharp', 'W-ZERO3 WS004SH', { carrier: 'Willcom' }],
-  WS007SH: ['Sharp', 'W-ZERO3 [es] WS007SH', { carrier: 'Willcom' }],
-  WS011SH: ['Sharp', 'Advanced / W-ZERO3 [es] WS011SH', { carrier: 'Willcom' }],
-  WS020SH: ['Sharp', 'WILLCOM 03 WS020SH', { carrier: 'Willcom' }],
-  WS027SH: ['Sharp', 'HYBRID W-ZERO3 WS027SH', { carrier: 'Willcom' }],
-  S01SH: ['Sharp', 'EM·ONE S01SH', { carrier: 'EMOBILE' }],
-  S01SH2: ['Sharp', 'EM·ONE alpha S01SH2', { carrier: 'EMOBILE' }],
+  WS003SH: ['Sharp', 'W-ZERO3 WS003SH', { carrier: 'Willcom' }],
+  WS004SH: ['Sharp', 'W-ZERO3 WS004SH', { carrier: 'Willcom' }],
+  WS007SH: ['Sharp', 'W-ZERO3 [es] WS007SH', { carrier: 'Willcom' }],
+  WS011SH: ['Sharp', 'Advanced / W-ZERO3 [es] WS011SH', { carrier: 'Willcom' }],
+  WS020SH: ['Sharp', 'WILLCOM 03 WS020SH', { carrier: 'Willcom' }],
+  WS027SH: ['Sharp', 'HYBRID W-ZERO3 WS027SH', { carrier: 'Willcom' }],
+  S01SH: ['Sharp', 'EM·ONE S01SH', { carrier: 'EMOBILE' }],
+  S01SH2: ['Sharp', 'EM·ONE alpha S01SH2', { carrier: 'EMOBILE' }],
   'T-01A!': ['Toshiba', 'T-01A', { carrier: 'DoCoMo' }],
   'T-01B!': ['Toshiba', 'dynapocket T-01B', { carrier: 'DoCoMo' }],
-  X01T: ['Toshiba', 'G900 X01T', { carrier: 'Softbank' }],
-  'X02T!': ['Toshiba', 'dynapocket X02T', { carrier: 'Softbank' }],
-  'KDDI-HT01': ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
-  HT01A: ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
-  S11HT: ['HTC', 'EMONSTER S11HT', { carrier: 'EMOBILE' }],
-  S12HT: ['HTC', 'EMONSTER lite S12HT', { carrier: 'EMOBILE' }],
-  S21HT: ['HTC', 'Touch Diamond S21HT', { carrier: 'EMOBILE' }],
-  S22HT: ['HTC', 'Dual Diamond S22HT', { carrier: 'EMOBILE' }],
-  X01HT: ['HTC', 'TyTN X01HT', { carrier: 'Softbank' }],
-  X02HT: ['HTC', 'S630 X02HT', { carrier: 'Softbank' }],
-  X03HT: ['HTC', 'S730 X03HT', { carrier: 'Softbank' }],
-  X04HT: ['HTC', 'TOUCH DIAMOND X04HT', { carrier: 'Softbank' }],
-  X05HT: ['HTC', 'TOUCH PRO X05HT', { carrier: 'Softbank' }],
+  X01T: ['Toshiba', 'G900 X01T', { carrier: 'Softbank' }],
+  'X02T!': ['Toshiba', 'dynapocket X02T', { carrier: 'Softbank' }],
+  'KDDI-HT01': ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
+  HT01A: ['HTC', 'TOUCH PRO HT-01A', { carrier: 'au' }],
+  S11HT: ['HTC', 'EMONSTER S11HT', { carrier: 'EMOBILE' }],
+  S12HT: ['HTC', 'EMONSTER lite S12HT', { carrier: 'EMOBILE' }],
+  S21HT: ['HTC', 'Touch Diamond S21HT', { carrier: 'EMOBILE' }],
+  S22HT: ['HTC', 'Dual Diamond S22HT', { carrier: 'EMOBILE' }],
+  X01HT: ['HTC', 'TyTN X01HT', { carrier: 'Softbank' }],
+  X02HT: ['HTC', 'S630 X02HT', { carrier: 'Softbank' }],
+  X03HT: ['HTC', 'S730 X03HT', { carrier: 'Softbank' }],
+  X04HT: ['HTC', 'TOUCH DIAMOND X04HT', { carrier: 'Softbank' }],
+  X05HT: ['HTC', 'TOUCH PRO X05HT', { carrier: 'Softbank' }],
   'SC-01B': ['Samsung', 'SC-01B', { carrier: 'DoCoMo' }],
-  X01SC: ['Samsung', 'OMNIA Pro X01SC', { carrier: 'Softbank' }]
+  X01SC: ['Samsung', 'OMNIA Pro X01SC', { carrier: 'Softbank' }]
 };
 
 /* This file is automatically generated, do not edit manually! */

data/models-kddi.js

@@ -7610,7 +7610,7 @@ exports.PROFILES = {
   'http://wap1.huawei.com/uaprof/HW_HUAWEI_H891L.xml': ['Huawei', 'Pronto', 'Android', DeviceType.MOBILE],
   'http://wap1.huawei.com/uaprof/HuaweiMediaPad_FDR-A04L.xml': [
     'Huawei',
-    'Qua tab 02 HWT31',
+    'Qua tab 02 HWT31',
     'Android',
     DeviceType.MOBILE,
   ],
@@ -9342,7 +9342,7 @@ exports.PROFILES = {
   'http://gsm.lge.com/html/gsm/L24-M3-D1.xml': ['LG', 'isai FL', 'Android', DeviceType.MOBILE],
   'http://gsm.lge.com/html/gsm/YSdHbanpHC5h2R_E/V32-M3-D1.xml': [
     'LG',
-    'isai vivid LGV32',
+    'isai vivid LGV32',
     'Android',
     DeviceType.MOBILE,
   ],
@@ -16891,7 +16891,7 @@ exports.PROFILES = {
   ],
   'http://wap.samsungmobile.com/uaprof/SM-G610F.xml': ['Samsung', 'Galaxy J7 Prime', 'Android', DeviceType.MOBILE],
   'http://wap.samsungmobile.com/uaprof/SM-G610Y.xml': ['Samsung', 'Galaxy J7 Prime', 'Android', DeviceType.MOBILE],
-  'http://wap.samsungmobile.com/uaprof/SGH-N075T.xml': ['Samsung', 'GALAXY J SC-02F', 'Android', DeviceType.MOBILE],
+  'http://wap.samsungmobile.com/uaprof/SGH-N075T.xml': ['Samsung', 'GALAXY J SC-02F', 'Android', DeviceType.MOBILE],
   'http://wap.samsungmobile.com/uaprof/SM-C111.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
   'http://wap.samsungmobile.com/uaprof/SM-C111M.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
   'http://wap.samsungmobile.com/uaprof/SM-C115.xml': ['Samsung', 'Galaxy K Zoom', 'Android', DeviceType.MOBILE],
@@ -17663,7 +17663,7 @@ exports.PROFILES = {
   'http://wap.samsungmobile.com/uaprof/SM-N915W8.xml': ['Samsung', 'Galaxy Note Edge', 'Android', DeviceType.MOBILE],
   'http://wap.samsungmobile.com/uaprof/SCL24.xml': [
     'Samsung',
-    'GALAXY Note Edge SCL24',
+    'GALAXY Note Edge SCL24',
     'Android',
     DeviceType.MOBILE,
   ],
@@ -19909,7 +19909,7 @@ exports.PROFILES = {
     'Android',
     DeviceType.MOBILE,
   ],
-  'http://wap.samsungmobile.com/uaprof/SC-05G.xml': ['Samsung', 'GALAXY S6 SC-05G', 'Android', DeviceType.MOBILE],
+  'http://wap.samsungmobile.com/uaprof/SC-05G.xml': ['Samsung', 'GALAXY S6 SC-05G', 'Android', DeviceType.MOBILE],
   'http://device.sprintpcs.com/Samsung/SM-G930P-BOOST/PH7.rdf': [
     'Samsung',
     'Galaxy S7',

data/models-wm.js

@@ -48,8 +48,8 @@
     readable: 'a Nokia Lumia 1320 running Windows Phone 8.0'
 -
     headers: 'User-Agent: SonySO-02F Build/14.1.H.1.281 UEP/0.1 com.sonyericsson.updatecenter/2.0.3.A.0.2'
-    readable: 'Sony Update Center on a Sony Xperia Z1 f SO-02F running Android'
-    result: { browser: { name: 'Sony Update Center', type: app }, os: { name: Android }, device: { type: mobile, subtype: smart, manufacturer: Sony, model: 'Xperia Z1 f SO-02F', carrier: DoCoMo } }
+    readable: 'Sony Update Center on a Sony Xperia Z1 f SO-02F running Android'
+    result: { browser: { name: 'Sony Update Center', type: app }, os: { name: Android }, device: { type: mobile, subtype: smart, manufacturer: Sony, model: 'Xperia Z1 f SO-02F', carrier: DoCoMo } }
 -
     headers: 'User-Agent: AiMeiTuan /samsung-4.0.4-SHV-E120S-1280x720-320-4.1.2-116-358362043662925-market'
     readable: 'AiMeiTuan on a Samsung Galaxy S II HD LTE running Android 4.0.4'

data/profiles.js

@@ -1,7 +1,7 @@
 -
     headers: 'User-Agent: YahooJMobileApp/1.1 (Android yjtop; 2.0.1) (samsung; SC-02C; samsung; SC-02C; 2.3.3/GINGERBREAD)'
-    result: { browser: { name: 'Yahoo Mobile', version: 2.0.1, type: 'app:search' }, os: { name: Android, version: 2.3.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
-    readable: 'Yahoo Mobile 2.0.1 on a Samsung GALAXY S II SC-02C running Android 2.3.3'
+    result: { browser: { name: 'Yahoo Mobile', version: 2.0.1, type: 'app:search' }, os: { name: Android, version: 2.3.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
+    readable: 'Yahoo Mobile 2.0.1 on a Samsung GALAXY S II SC-02C running Android 2.3.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 6.0.1; Le X527 Build/IMXOSOP5801910251S; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/49.0.2623.91 Mobile Safari/537.36 YandexSearch/7.15'
     readable: 'Yandex Search 7.15 on a LeEco Le 2 X527 running Android 6.0.1'

test/data/mobile/app-other.yaml

@@ -40,12 +40,12 @@
     readable: 'Chrome 30 on an Asus Transformer Pad 300 running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; F-10D Build/V20R47F) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.33 Mobile Safari/537.22'
-    result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS X F-10D', carrier: DoCoMo } }
-    readable: 'Chrome 25 on a Fujitsu ARROWS X F-10D running Android 4.0.3'
+    result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS X F-10D', carrier: DoCoMo } }
+    readable: 'Chrome 25 on a Fujitsu ARROWS X F-10D running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; F-11D Build/V21R36A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.74 Mobile Safari/537.36'
-    result: { browser: { name: Chrome, version: '27', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Me F-11D', carrier: DoCoMo } }
-    readable: 'Chrome 27 on a Fujitsu ARROWS Me F-11D running Android 4.0.3'
+    result: { browser: { name: Chrome, version: '27', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Me F-11D', carrier: DoCoMo } }
+    readable: 'Chrome 27 on a Fujitsu ARROWS Me F-11D running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; FZ-A1B Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Safari/537.36'
     result: { browser: { name: Chrome, version: '31', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: tablet, manufacturer: Panasonic, model: 'Toughpad FZ-A1' } }
@@ -64,20 +64,20 @@
     readable: 'Chrome 38 on a HTC Raider 4G running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; ISW12HT Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.111 Mobile Safari/537.36'
-    result: { browser: { name: Chrome, version: '42', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: HTC, model: 'EVO 3D ISW12HT', carrier: au } }
-    readable: 'Chrome 42 on a HTC EVO 3D ISW12HT running Android 4.0.3'
+    result: { browser: { name: Chrome, version: '42', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: HTC, model: 'EVO 3D ISW12HT', carrier: au } }
+    readable: 'Chrome 42 on a HTC EVO 3D ISW12HT running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; ISW13F Build/V77R60B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36'
-    result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Z ISW13F', carrier: au } }
-    readable: 'Chrome 38 on a Fujitsu ARROWS Z ISW13F running Android 4.0.3'
+    result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Fujitsu, model: 'ARROWS Z ISW13F', carrier: au } }
+    readable: 'Chrome 38 on a Fujitsu ARROWS Z ISW13F running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; Lenovo S880 Build/IML74K) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.123 Mobile Safari/537.22'
     result: { browser: { name: Chrome, version: '25', type: browser }, engine: { name: Webkit, version: '537.22' }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Lenovo, model: S880 } }
     readable: 'Chrome 25 on a Lenovo S880 running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; SC-02C Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Mobile Safari/537.36'
-    result: { browser: { name: Chrome, version: '33', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
-    readable: 'Chrome 33 on a Samsung GALAXY S II SC-02C running Android 4.0.3'
+    result: { browser: { name: Chrome, version: '33', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: mobile, subtype: smart, manufacturer: Samsung, model: 'GALAXY S II SC-02C', carrier: DoCoMo } }
+    readable: 'Chrome 33 on a Samsung GALAXY S II SC-02C running Android 4.0.3'
 -
     headers: 'User-Agent: Mozilla/5.0 (Linux; Android 4.0.3; Sony Tablet S Build/TISU0143) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.114 Safari/537.36'
     result: { browser: { name: Chrome, version: '38', type: browser }, engine: { name: Blink }, os: { name: Android, version: 4.0.3 }, device: { type: tablet, manufacturer: Sony, model: 'Tablet S' } }

test/data/mobile/app-search.yaml

@@ -24,8 +24,8 @@
     readable: 'Jig Browser 8.1.6 on a Sharp 934SH'
 -
     headers: 'User-Agent: Mozilla/4.0 (jig browser web; 1.0.0; SN3F)'
-    result: { browser: { name: 'Jig Browser', version: 1.0.0, type: browser }, device: { type: mobile, subtype: feature, manufacturer: 'Sony Ericsson', model: re W63S, carrier: au } }
-    readable: 'Jig Browser 1.0.0 on a Sony Ericsson re W63S'
+    result: { browser: { name: 'Jig Browser', version: 1.0.0, type: browser }, device: { type: mobile, subtype: feature, manufacturer: 'Sony Ericsson', model: re W63S, carrier: au } }
+    readable: 'Jig Browser 1.0.0 on a Sony Ericsson re W63S'
 -
     headers: 'User-Agent: Mozilla/4.0 (jig browser web; 1.0.4; 706P)'
     result: { browser: { name: 'Jig Browser', version: 1.0.4, type: browser }, device: { type: mobile, subtype: feature, manufacturer: Panasonic, model: 706P, carrier: Softbank } }