@tinkoff/user-agent 0.4.381 → 0.4.384

package/lib/client-hints.d.ts

@@ -9,7 +9,7 @@ import type { UserAgent } from './types';
  * - CPU architecture
  * - device model
  *
- * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
+ * To be able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
  *
  * @param headers
  * @returns
@@ -25,5 +25,8 @@ export declare const parseClientHintsHeaders: (headers: Record<string, string |
  * @see https://wicg.github.io/ua-client-hints/#user-agent-model
  *
  * @param payload
+ *
+ * @example
+ * const clientHints = parseClientHintsUserAgentData(window.navigator.userAgentData)
  */
 export declare const parseClientHintsUserAgentData: (payload: UADataValues) => UserAgent;

package/lib/client-hints.es.js

@@ -2,6 +2,12 @@ import { getMobileOs, getBrowserEngine } from './utils.es.js';
 
 const KNOWN_VENDORS = new Set(['Opera', 'Google Chrome', 'Microsoft Edge', 'Firefox', 'Safari']);
 const KNOWN_ENGINES = new Set(['Chromium']);
+const BACKWARD_COMPATIBILITY_BROWSER_NAME = {
+    'Google Chrome': 'chrome',
+};
+const BACKWARD_COMPATIBILITY_OS_NAME = {
+    macOS: 'Mac OS',
+};
 const parseQuotedString = (str) => {
     var _a;
     if (!str) {
@@ -26,9 +32,10 @@ const parseBrowserFromString = (brandsList) => {
         version: undefined,
     };
     brandsList.split(',').forEach((entry) => {
+        var _a;
         const [name, version] = entry.split(/;\s*v=/).map(parseQuotedString);
         if (name && KNOWN_VENDORS.has(name)) {
-            browser.name = name.toLowerCase();
+            browser.name = (_a = BACKWARD_COMPATIBILITY_BROWSER_NAME[name]) !== null && _a !== void 0 ? _a : name.toLowerCase();
             browser.version = version;
             browser.major = version;
         }
@@ -56,8 +63,9 @@ const parseBrowserFromUserAgentData = (brands) => {
         version: undefined,
     };
     brands.forEach(({ brand, version }) => {
+        var _a;
         if (KNOWN_VENDORS.has(brand)) {
-            browser.name = brand.toLowerCase();
+            browser.name = (_a = BACKWARD_COMPATIBILITY_BROWSER_NAME[brand]) !== null && _a !== void 0 ? _a : brand.toLowerCase();
             browser.version = version;
             [browser.major] = version.split('.');
         }
@@ -73,6 +81,13 @@ const parseBrowserFromUserAgentData = (brands) => {
     browser.browserEngine = getBrowserEngine(browser.name, engine.name);
     return { browser, engine };
 };
+const getBackwardCompatibleOsName = (payload) => {
+    var _a;
+    if (payload === undefined) {
+        return undefined;
+    }
+    return (_a = BACKWARD_COMPATIBILITY_OS_NAME[payload]) !== null && _a !== void 0 ? _a : payload;
+};
 /**
  *
  * @description
@@ -83,7 +98,7 @@ const parseBrowserFromUserAgentData = (brands) => {
  * - CPU architecture
  * - device model
  *
- * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
+ * To be able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
  *
  * @param headers
  * @returns
@@ -96,7 +111,7 @@ const parseClientHintsHeaders = (headers) => {
         browser,
         engine,
         os: {
-            name: osName,
+            name: getBackwardCompatibleOsName(osName),
             version: parseQuotedString(headers['sec-ch-ua-platform-version']),
         },
         cpu: {
@@ -123,6 +138,9 @@ const parseClientHintsHeaders = (headers) => {
  * @see https://wicg.github.io/ua-client-hints/#user-agent-model
  *
  * @param payload
+ *
+ * @example
+ * const clientHints = parseClientHintsUserAgentData(window.navigator.userAgentData)
  */
 const parseClientHintsUserAgentData = (payload) => {
     const { browser, engine } = parseBrowserFromUserAgentData(payload.fullVersionList || payload.brands || []);
@@ -130,7 +148,7 @@ const parseClientHintsUserAgentData = (payload) => {
         browser,
         engine,
         os: {
-            name: payload.platform,
+            name: getBackwardCompatibleOsName(payload.platform),
             version: payload.platformVersion,
         },
         cpu: {

package/lib/client-hints.js

@@ -6,6 +6,12 @@ var utils = require('./utils.js');
 
 const KNOWN_VENDORS = new Set(['Opera', 'Google Chrome', 'Microsoft Edge', 'Firefox', 'Safari']);
 const KNOWN_ENGINES = new Set(['Chromium']);
+const BACKWARD_COMPATIBILITY_BROWSER_NAME = {
+    'Google Chrome': 'chrome',
+};
+const BACKWARD_COMPATIBILITY_OS_NAME = {
+    macOS: 'Mac OS',
+};
 const parseQuotedString = (str) => {
     var _a;
     if (!str) {
@@ -30,9 +36,10 @@ const parseBrowserFromString = (brandsList) => {
         version: undefined,
     };
     brandsList.split(',').forEach((entry) => {
+        var _a;
         const [name, version] = entry.split(/;\s*v=/).map(parseQuotedString);
         if (name && KNOWN_VENDORS.has(name)) {
-            browser.name = name.toLowerCase();
+            browser.name = (_a = BACKWARD_COMPATIBILITY_BROWSER_NAME[name]) !== null && _a !== void 0 ? _a : name.toLowerCase();
             browser.version = version;
             browser.major = version;
         }
@@ -60,8 +67,9 @@ const parseBrowserFromUserAgentData = (brands) => {
         version: undefined,
     };
     brands.forEach(({ brand, version }) => {
+        var _a;
         if (KNOWN_VENDORS.has(brand)) {
-            browser.name = brand.toLowerCase();
+            browser.name = (_a = BACKWARD_COMPATIBILITY_BROWSER_NAME[brand]) !== null && _a !== void 0 ? _a : brand.toLowerCase();
             browser.version = version;
             [browser.major] = version.split('.');
         }
@@ -77,6 +85,13 @@ const parseBrowserFromUserAgentData = (brands) => {
     browser.browserEngine = utils.getBrowserEngine(browser.name, engine.name);
     return { browser, engine };
 };
+const getBackwardCompatibleOsName = (payload) => {
+    var _a;
+    if (payload === undefined) {
+        return undefined;
+    }
+    return (_a = BACKWARD_COMPATIBILITY_OS_NAME[payload]) !== null && _a !== void 0 ? _a : payload;
+};
 /**
  *
  * @description
@@ -87,7 +102,7 @@ const parseBrowserFromUserAgentData = (brands) => {
  * - CPU architecture
  * - device model
  *
- * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
+ * To be able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
  *
  * @param headers
  * @returns
@@ -100,7 +115,7 @@ const parseClientHintsHeaders = (headers) => {
         browser,
         engine,
         os: {
-            name: osName,
+            name: getBackwardCompatibleOsName(osName),
             version: parseQuotedString(headers['sec-ch-ua-platform-version']),
         },
         cpu: {
@@ -127,6 +142,9 @@ const parseClientHintsHeaders = (headers) => {
  * @see https://wicg.github.io/ua-client-hints/#user-agent-model
  *
  * @param payload
+ *
+ * @example
+ * const clientHints = parseClientHintsUserAgentData(window.navigator.userAgentData)
  */
 const parseClientHintsUserAgentData = (payload) => {
     const { browser, engine } = parseBrowserFromUserAgentData(payload.fullVersionList || payload.brands || []);
@@ -134,7 +152,7 @@ const parseClientHintsUserAgentData = (payload) => {
         browser,
         engine,
         os: {
-            name: payload.platform,
+            name: getBackwardCompatibleOsName(payload.platform),
             version: payload.platformVersion,
         },
         cpu: {

package/lib/satisfies.d.ts

@@ -1,5 +1,7 @@
 import type { UserAgent } from './types';
-export declare const satisfies: (userAgent: UserAgent | string, browserslistConfig?: string[], { env, forceMinimumUnknownVersions, }?: {
-    env?: "modern" | "defaults" | undefined;
-    forceMinimumUnknownVersions?: boolean | undefined;
-}) => boolean | null;
+interface SatisfiesOptions {
+    env?: 'modern' | 'defaults';
+    forceMinimumUnknownVersions?: boolean;
+}
+export declare const satisfies: (userAgent: UserAgent | string, browserslistConfig?: string[], { env, forceMinimumUnknownVersions }?: SatisfiesOptions) => boolean | null;
+export {};

package/lib/satisfies.es.js

@@ -49,7 +49,7 @@ const normalizedBrowserslist = (query) => {
     }
     return result;
 };
-const satisfies = (userAgent, browserslistConfig, { env = 'defaults', forceMinimumUnknownVersions = false, } = {}) => {
+const satisfies = (userAgent, browserslistConfig, { env = 'defaults', forceMinimumUnknownVersions = false } = {}) => {
     var _a, _b;
     const ua = isString(userAgent) ? parseUserAgentHeader(userAgent) : userAgent;
     const { engine: { name: engineName = '', version: engineVersion }, device: { type = '' } = {}, } = ua;

package/lib/satisfies.js

@@ -60,7 +60,7 @@ const normalizedBrowserslist = (query) => {
     }
     return result;
 };
-const satisfies = (userAgent$1, browserslistConfig, { env = 'defaults', forceMinimumUnknownVersions = false, } = {}) => {
+const satisfies = (userAgent$1, browserslistConfig, { env = 'defaults', forceMinimumUnknownVersions = false } = {}) => {
     var _a, _b;
     const ua = isString__default["default"](userAgent$1) ? userAgent.parseUserAgentHeader(userAgent$1) : userAgent$1;
     const { engine: { name: engineName = '', version: engineVersion }, device: { type = '' } = {}, } = ua;

package/lib/userAgent.es.js

@@ -27,14 +27,13 @@ const parseUserAgentHeader = (userAgent) => {
     const { browser, os, engine } = result;
     const browserName = toLowerName(browser);
     const engineName = toLowerName(engine);
-    const sameSiteNoneCompatible = isSameSiteNoneCompatible(result);
     if (browserName === 'opera mobi') {
         result.device.type = 'mobile';
     }
     return {
         ...result,
         mobileOS: getMobileOs(os.name),
-        sameSiteNoneCompatible,
+        sameSiteNoneCompatible: isSameSiteNoneCompatible(result),
         browser: {
             ...browser,
             browserEngine: getBrowserEngine(browserName, engineName),

package/lib/userAgent.js

@@ -37,14 +37,13 @@ const parseUserAgentHeader = (userAgent) => {
     const { browser, os, engine } = result;
     const browserName = toLowerName(browser);
     const engineName = toLowerName(engine);
-    const sameSiteNoneCompatible = isSameSiteNoneCompatible.isSameSiteNoneCompatible(result);
     if (browserName === 'opera mobi') {
         result.device.type = 'mobile';
     }
     return {
         ...result,
         mobileOS: utils.getMobileOs(os.name),
-        sameSiteNoneCompatible,
+        sameSiteNoneCompatible: isSameSiteNoneCompatible.isSameSiteNoneCompatible(result),
         browser: {
             ...browser,
             browserEngine: utils.getBrowserEngine(browserName, engineName),

package/lib/utils.es.js

@@ -19,7 +19,7 @@ const getBrowserEngine = (browserName, engineName) => {
         // then define the `browserName` as `safari`, because all browsers
         // on iOS use webkit. Also, we are not handling mobile Safari separately,
         // as it webkit too. See https://en.wikipedia.org/wiki/WebKit
-        case browserName === 'safari' || engineName === 'webkit':
+        case browserName === 'safari' || browserName === 'mobile safari' || engineName === 'webkit':
             return 'safari';
         // We aren't using something like `browserName === 'chrome'` here,
         // because there are a lot of browsers based on chromium.

package/lib/utils.js

@@ -23,7 +23,7 @@ const getBrowserEngine = (browserName, engineName) => {
         // then define the `browserName` as `safari`, because all browsers
         // on iOS use webkit. Also, we are not handling mobile Safari separately,
         // as it webkit too. See https://en.wikipedia.org/wiki/WebKit
-        case browserName === 'safari' || engineName === 'webkit':
+        case browserName === 'safari' || browserName === 'mobile safari' || engineName === 'webkit':
             return 'safari';
         // We aren't using something like `browserName === 'chrome'` here,
         // because there are a lot of browsers based on chromium.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/user-agent",
-  "version": "0.4.381",
+  "version": "0.4.384",
   "description": "",
   "main": "lib/index.js",
   "module": "lib/index.es.js",
@@ -29,7 +29,7 @@
     "user-agent-data-types": "^0.3.1"
   },
   "peerDependencies": {
-    "@tramvai/cli": "2.130.7",
+    "@tramvai/cli": "2.130.10",
     "@types/ua-parser-js": "^0.7.33"
   },
   "license": "Apache-2.0"