Add more OS descriptors

src/parser-os.js

@@ -1,4 +1,6 @@
-import { getFirstMatch } from './utils';
+import {
+  getFirstMatch
+} from './utils';
 
 function getWindowsVersionName(version) {
   switch (version) {
@@ -17,6 +19,7 @@ function getWindowsVersionName(version) {
 }
 
 export default [
+  /* Windows Phone */
   {
     test: [/windows phone/i],
     describe(ua) {
@@ -27,6 +30,8 @@ export default [
       }
     }
   },
+
+  /* Windows */
   {
     test: [/windows/i],
     describe(ua) {
@@ -40,6 +45,8 @@ export default [
       };
     }
   },
+
+  /* macOS */
   {
     test: [/macintosh/i],
     describe(ua) {
@@ -47,7 +54,89 @@ export default [
       return {
         name: 'macOS',
         version
-      }
+      };
+    }
+  },
+
+  /* iOS */
+  {
+    test: [/(ipod|iphone|ipad)/i],
+    describe(ua) {
+      const version = getFirstMatch(/os (\d+([_\s]\d+)*) like mac os x/i, ua).replace(/[_\s]/g, '.');
+
+      return {
+        name: 'iOS',
+        version
+      };
+    }
+  },
+
+  /* Android */
+  {
+    test(parser) {
+      const notLikeAndroid = !parser.test(/^((?!like android).)*$/i);
+      const butAndroid = parser.test(/android/i);
+      return notLikeAndroid && butAndroid;
+    },
+    describe(ua) {
+      const version = getFirstMatch(/android[ \/-](\d+(\.\d+)*)/i, ua);
+      return {
+        name: 'Android',
+        version
+      };
+    }
+  },
+
+  /* WebOS */
+  {
+    test: [/(web|hpw)os/i],
+    describe(ua) {
+      const version = getFirstMatch(/(?:web|hpw)os\/(\d+(\.\d+)*)/i, ua);
+      return {
+        name: 'WebOS',
+        version
+      };
+    }
+  },
+
+  /* BlackBerry */
+  {
+    test: [/blackberry|\bbb\d+/i, /rim\stablet/i],
+    describe(ua) {
+      const version = getFirstMatch(/rim\stablet\sos\s(\d+(\.\d+)*)/i, ua)
+        || getFirstMatch(/blackberry\d+\/(\d+([_\s]\d+)*)/i, ua)
+        || getFirstMatch(/\bbb(\d+)/i, ua);
+
+      return {
+        name: 'BlackBerry',
+        version
+      };
+    }
+  },
+
+  /* Bada */
+  {
+    test: [/bada/i],
+    describe(ua) {
+      const version = getFirstMatch(/bada\/(\d+(\.\d+)*)/i, ua);
+
+      return {
+        name: 'Bada',
+        version
+      };
+    }
+  },
+
+  /* Tizen */
+  {
+    test: [/tizen/i],
+    describe(ua) {
+      const version = getFirstMatch(/tizen[\/\s](\d+(\.\d+)*)/i, ua);
+
+      return {
+        name: 'Tizen',
+        version
+      };
     }
   }
 ]

src/utils.js

@@ -20,6 +20,20 @@ class Utils {
     const match = ua.match(regexp);
     return (match && match.length > 1 && match[2]) || '';
   }
+
+  /**
+   * Match a regexp and return a constant or undefined
+   * @param {RegExp} regexp
+   * @param {String} ua
+   * @param {*} _const Any const that will be returned if regexp matches the string
+   * @return {*}
+   */
+  static matchAndReturnConst(regexp, ua, _const) {
+    if (regexp.test(ua)) {
+      return _const;
+    }
+    return void(0);
+  }
 }
 
 module.exports = Utils;