@tinkoff/user-agent 0.8.102 → 0.8.105

package/lib/parse-user-agent-header/parseUserAgentHeader.d.ts

@@ -1,3 +1,3 @@
-import { type UserAgent } from '../types';
-export declare const parseUserAgentHeader: (userAgent: string) => UserAgent;
+import { UAParserExtensionsTypes, type UserAgent } from '../types';
+export declare const parseUserAgentHeader: (userAgent: string, extensions?: UAParserExtensionsTypes[] | null) => UserAgent;
 //# sourceMappingURL=parseUserAgentHeader.d.ts.map

package/lib/parse-user-agent-header/parseUserAgentHeader.es.js

@@ -2,12 +2,14 @@ import { UAParser } from 'ua-parser-js';
 import { isSameSiteNoneCompatible } from './utils/is-same-site-none-compatible/isSameSiteNoneCompatible.es.js';
 import { getBrowserEngine } from '../utils/getBrowserEngine.es.js';
 import { getMobileOs } from '../utils/getMobileOs.es.js';
-import { uaParserExtensions } from './consts.es.js';
 import { toLowerName } from './utils/toLowerName.es.js';
 import { DeviceType } from '../constants.es.js';
+import { mergeExtensions } from './utils/mergeExtensions.es.js';
 
-const parseUserAgentHeader = (userAgent) => {
-    const { ua, ...result } = new UAParser(userAgent, { browser: uaParserExtensions }).getResult();
+const parseUserAgentHeader = (userAgent, extensions) => {
+    const { ua, ...result } = new UAParser(userAgent, {
+        ...mergeExtensions(extensions || []),
+    }).getResult();
     const { browser, os, engine } = result;
     const browserName = toLowerName(browser);
     const engineName = toLowerName(engine);

package/lib/parse-user-agent-header/parseUserAgentHeader.js

@@ -6,12 +6,14 @@ var uaParserJs = require('ua-parser-js');
 var isSameSiteNoneCompatible = require('./utils/is-same-site-none-compatible/isSameSiteNoneCompatible.js');
 var getBrowserEngine = require('../utils/getBrowserEngine.js');
 var getMobileOs = require('../utils/getMobileOs.js');
-var consts = require('./consts.js');
 var toLowerName = require('./utils/toLowerName.js');
 var constants = require('../constants.js');
+var mergeExtensions = require('./utils/mergeExtensions.js');
 
-const parseUserAgentHeader = (userAgent) => {
-    const { ua, ...result } = new uaParserJs.UAParser(userAgent, { browser: consts.uaParserExtensions }).getResult();
+const parseUserAgentHeader = (userAgent, extensions) => {
+    const { ua, ...result } = new uaParserJs.UAParser(userAgent, {
+        ...mergeExtensions.mergeExtensions(extensions || []),
+    }).getResult();
     const { browser, os, engine } = result;
     const browserName = toLowerName.toLowerName(browser);
     const engineName = toLowerName.toLowerName(engine);

package/lib/parse-user-agent-header/utils/mergeExtensions.d.ts

@@ -0,0 +1,3 @@
+import { UAParserExtensionsTypes } from '../../types';
+export declare const mergeExtensions: (extensions?: UAParserExtensionsTypes[]) => UAParserExtensionsTypes | undefined;
+//# sourceMappingURL=mergeExtensions.d.ts.map

package/lib/parse-user-agent-header/utils/mergeExtensions.es.js

@@ -0,0 +1,21 @@
+import { uaParserExtensions } from '../consts.es.js';
+
+const mergeExtensions = (extensions) => {
+    if (!extensions?.length) {
+        return {
+            browser: [...uaParserExtensions],
+        };
+    }
+    const merged = extensions.reduce((acc, curr) => ({
+        browser: [...(acc.browser || []), ...(curr.browser || [])],
+        os: [...(acc.os || []), ...(curr.os || [])],
+        device: [...(acc.device || []), ...(curr.device || [])],
+        engine: [...(acc.engine || []), ...(curr.engine || [])],
+    }), {});
+    return {
+        ...merged,
+        browser: [...(merged.browser || []), ...uaParserExtensions],
+    };
+};
+
+export { mergeExtensions };

package/lib/parse-user-agent-header/utils/mergeExtensions.js

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var consts = require('../consts.js');
+
+const mergeExtensions = (extensions) => {
+    if (!extensions?.length) {
+        return {
+            browser: [...consts.uaParserExtensions],
+        };
+    }
+    const merged = extensions.reduce((acc, curr) => ({
+        browser: [...(acc.browser || []), ...(curr.browser || [])],
+        os: [...(acc.os || []), ...(curr.os || [])],
+        device: [...(acc.device || []), ...(curr.device || [])],
+        engine: [...(acc.engine || []), ...(curr.engine || [])],
+    }), {});
+    return {
+        ...merged,
+        browser: [...(merged.browser || []), ...consts.uaParserExtensions],
+    };
+};
+
+exports.mergeExtensions = mergeExtensions;

package/lib/types.d.ts

@@ -50,4 +50,11 @@ export interface UserAgent {
     mobileOS?: string;
     sameSiteNoneCompatible: boolean;
 }
+export type UAParserExtensionSource = (RegExp[] | (string[] | string)[])[];
+export type UAParserExtensionsTypes = {
+    browser?: UAParserExtensionSource;
+    device?: UAParserExtensionSource;
+    os?: UAParserExtensionSource;
+    engine?: UAParserExtensionSource;
+};
 //# sourceMappingURL=types.d.ts.map

package/package.json

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