@js-toolkit/web-utils 1.50.0 → 1.51.1

package/ga/DataLayerProxy.js

@@ -1 +1 @@
-import{getHandler}from"./getHandler";export class DataLayerProxy{constructor(r){const e=getHandler("auto",r);if(!e)throw new Error("Data layer for Google Analytics is undefined.");this.handler=e}push(r){this.handler(r)}}
+import{getHandler}from"./getHandler";export class DataLayerProxy{constructor(r){const t=getHandler("auto",r);if(!t)throw new Error("Google Analytics handler is not created.");this.handler=t}push(r){this.handler(r)}}

package/ga/getHandler.d.ts

@@ -1,18 +1,26 @@
 import { type GAEventMessage } from './iframeMessenger';
-import './types';
+import type { GTMEventData } from './types';
 export interface GAEventData {
-    eventCategory: string;
-    action: string;
-    label: string | undefined;
-    trackingId: string | undefined;
+    readonly eventCategory: string;
+    readonly action: string;
+    readonly label: string | undefined;
+    /**
+     * Идентификатор потока данных
+     * (https://support.google.com/analytics/answer/12270356?hl=ru).
+     *
+     * Можно не указывать, если:
+     * - используется Google Tag Manager (gtm.js) с настроенным тегом, в котором самостоятельно указан идентификатор потока данных.
+     * - используется Google Tag (gtag.js) с указанным идентификатором потока данных по умолчанию.
+     */
+    readonly measurementId: string | undefined;
 }
 export interface GADataHandler<D extends GAEventData> {
     (data: D): void;
 }
-type GALibType = 'gtm' | 'gtag' | 'ga' | 'iframe' | 'auto';
+type GALibType = 'gtm' | 'gtag' | /* 'ga' | */ 'iframe' | 'auto';
 export type GAEventDataTransformer<D extends GAEventData, L extends Extract<GALibType, 'gtm' | 'iframe'>> = (data: D) => {
-    gtm: GTMEventData;
-    iframe: GAEventMessage<string, D>;
+    readonly gtm: GTMEventData;
+    readonly iframe: GAEventMessage<string, D>;
 }[L];
 export type GAEventDataTransformerMap<D extends GAEventData, L extends Extract<GALibType, 'gtm' | 'iframe'> = Extract<GALibType, 'gtm' | 'iframe'>> = L extends L ? Record<L, GAEventDataTransformer<D, L>> : never;
 export declare function getHandler<D extends GAEventData, L extends GALibType>(gaLib: L, transformers: L extends 'auto' | 'gtm' | 'iframe' ? GAEventDataTransformerMap<D> : undefined): GADataHandler<D> | undefined;

package/ga/getHandler.js

@@ -1 +1 @@
-import{iframeMessenger}from"./iframeMessenger";import"./types";function gtmHandler(e,n,t){e.push(n(t))}function gtagHandler(e,n){const{action:t,eventCategory:a,trackingId:o,label:i}=n;e("event",t,{send_to:o,event_category:a,event_label:i,value:void 0})}function gaHandler(e,n,t){const a=window[e];if(!a)return;const{action:o,eventCategory:i,trackingId:r,label:d}=t,g={hitType:"event",eventCategory:i,eventAction:o,eventLabel:d,eventValue:void 0};if(r){const e=()=>{var e;const t=null!==(e=n[r])&&void 0!==e?e:a.getAll().find((e=>e.get("trackingId")===r));t&&(n[r]=t,t.send(g))};a.loaded?e():a(e)}else a("send",g)}export function getHandler(e,n){switch(e){case"auto":return window.gtag?getHandler("gtag",void 0):window.GoogleAnalyticsObject&&window[window.GoogleAnalyticsObject]||window.ga?getHandler("ga",void 0):window.dataLayer?getHandler("gtm",n):window.parent!==window?getHandler("iframe",n):void 0;case"iframe":return e=>{const t=n.iframe(e);iframeMessenger(t.type,t.event)};case"gtm":{const{dataLayer:e}=window;return e?t=>{gtmHandler(e,n.gtm,t)}:void 0}case"gtag":return window.gtag?gtagHandler.bind(void 0,window.gtag):void 0;case"ga":{const e=window.GoogleAnalyticsObject||"ga";return window[e]?gaHandler.bind(void 0,e,{}):void 0}default:throw new Error(`Unknown GA lib type '${e}'.`)}}
+import{iframeMessenger}from"./iframeMessenger";function gtmHandler(e,t,n){e.push(t(n))}function gtagHandler(e,t){const{action:n,eventCategory:a,measurementId:r,label:o}=t;e("event",n,{send_to:r,event_category:a,event_label:o,value:void 0})}export function getHandler(e,t){switch(e){case"auto":return window.gtag?getHandler("gtag",void 0):window.dataLayer?getHandler("gtm",t):window.parent!==window?getHandler("iframe",t):void 0;case"iframe":return e=>{const n=t.iframe(e);iframeMessenger(n.type,n.event)};case"gtm":{const{dataLayer:e}=window;return e?n=>{gtmHandler(e,t.gtm,n)}:void 0}case"gtag":return window.gtag?gtagHandler.bind(void 0,window.gtag):void 0;default:throw new Error(`Unknown GA lib type '${e}'.`)}}

package/ga/types.d.ts

@@ -1,4 +1,4 @@
-interface GTMEventData {
+export interface GTMEventData {
     event: string;
 }
 interface GTMDataLayer<D extends GTMEventData> {
@@ -11,31 +11,12 @@ interface GTagEventData {
     send_to: string | undefined;
 }
 type GTagParams = [type: 'event', event: string, data: GTagEventData];
-interface GAObjectEventData {
-    hitType: 'event';
-    eventCategory: string;
-    eventAction: string;
-    eventLabel: string | undefined;
-    eventValue: number | undefined;
-}
-type GACommandParams = [command: 'send', data: GAObjectEventData];
-interface GATracker {
-    get(field: string): unknown;
-    send(data: GAObjectEventData): void;
-}
-interface GAObject {
-    readonly loaded?: boolean | undefined;
-    getAll(): GATracker[];
-    (...params: GACommandParams): void;
-    (readyCallback: VoidFunction): void;
-}
-interface Window {
-    /** Universal Analytics object name, default `ga`. */
-    GoogleAnalyticsObject?: string | undefined;
-    /** Universal Analytics without gtag. */
-    ga?: GAObject | undefined;
-    /** Global Site Tag */
-    gtag?: ((...params: GTagParams) => void) | undefined;
-    /** Google Tag Manager */
-    dataLayer?: GTMDataLayer<GTMEventData> | undefined;
+declare global {
+    interface Window {
+        /** Google tag */
+        gtag?: ((...params: GTagParams) => void) | undefined;
+        /** Google Tag Manager */
+        dataLayer?: GTMDataLayer<GTMEventData> | undefined;
+    }
 }
+export {};

package/ga/types.js

@@ -1 +1 @@
-"use strict";
+export{};

package/media/mse/getMediaSource.d.ts

@@ -1,6 +1,18 @@
 declare global {
+    interface ManagedMediaSourceEventMap extends MediaSourceEventMap {
+        startstreaming: Event;
+        endstreaming: Event;
+    }
+    interface ManagedMediaSource extends MediaSource {
+        readonly streaming: boolean;
+        onstartstreaming: ((this: ManagedMediaSource, ev: Event) => any) | null;
+        onendstreaming: ((this: ManagedMediaSource, ev: Event) => any) | null;
+        addEventListener<K extends keyof ManagedMediaSourceEventMap>(type: K, listener: (this: MediaSource, ev: ManagedMediaSourceEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+        removeEventListener<K extends keyof ManagedMediaSourceEventMap>(type: K, listener: (this: MediaSource, ev: ManagedMediaSourceEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    }
     interface Window {
         WebKitMediaSource?: typeof MediaSource;
+        ManagedMediaSource?: ManagedMediaSource;
     }
 }
 export declare function getMediaSource(): typeof MediaSource | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-toolkit/web-utils",
-  "version": "1.50.0",
+  "version": "1.51.1",
   "description": "Web utils",
   "author": "VZH",
   "license": "MIT",
@@ -20,11 +20,11 @@
     "@js-toolkit/node-utils": "^1.2.0"
   },
   "devDependencies": {
-    "@js-toolkit/configs": "^3.89.1",
-    "@js-toolkit/utils": "^1.50.0",
+    "@js-toolkit/configs": "^3.90.0",
+    "@js-toolkit/utils": "^1.51.0",
     "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.18.1",
-    "@typescript-eslint/parser": "^6.18.1",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
     "copyfiles": "^2.4.1",
     "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -32,14 +32,14 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
     "eventemitter3": "^5.0.1",
-    "prettier": "^3.2.2",
+    "prettier": "^3.2.4",
     "reconnecting-websocket": "^4.4.0",
     "rimraf": "^5.0.5",
-    "terser": "^5.26.0",
+    "terser": "^5.27.0",
     "typescript": "^5.3.3",
     "ua-parser-js": "^2.0.0-beta.1",
     "uuid": "^9.0.1",
-    "webpack": "^5.89.0",
+    "webpack": "^5.90.0",
     "yargs": "^17.7.2"
   }
 }

package/platform/getIOSVersion.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";import{isIOS}from"./isIOS";let memo;export function getIOSVersion(){if(void 0===memo){const o=getCachedUAInfo();if(!o)return;const{os:e}=o,t=isIOS()&&e.version&&/(\d+)\.(\d+)(?:\.(\d+))?/.exec(e.version);memo=t?{major:parseInt(t[1],10)||0,minor:parseInt(t[2],10)||0,patch:parseInt(t[3],10)||0,toString(){return`${this.major}_${this.minor}_${this.patch}`}}:null}return null!=memo?memo:void 0}
+import{getCachedPlatformInfo}from"./getPlatformInfo";import{isIOS}from"./isIOS";let memo;export function getIOSVersion(){if(void 0===memo){const o=getCachedPlatformInfo();if(!o)return;const{os:t}=o,r=isIOS()&&t.version&&/(\d+)\.(\d+)(?:\.(\d+))?/.exec(t.version);memo=r?{major:parseInt(r[1],10)||0,minor:parseInt(r[2],10)||0,patch:parseInt(r[3],10)||0,toString(){return`${this.major}_${this.minor}_${this.patch}`}}:null}return null!=memo?memo:void 0}

package/platform/getPlatformInfo.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="ua-parser-js/src/main/ua-parser" />
+type PlatformInfo = DeepReadonly<OmitStrict<UAParser.IResult, 'withClientHints' | 'withFeatureCheck'>> & {
+    toStringObject(): Record<Keys<ExcludeKeysOfType<UAParser.IResult, AnyFunction>>, string>;
+};
+export declare function getPlatformInfo(): Promise<PlatformInfo>;
+export declare function getCachedPlatformInfo(): PlatformInfo | undefined;
+export {};

package/platform/getPlatformInfo.js

@@ -0,0 +1 @@
+import{__awaiter}from"tslib";import{UAParser}from"ua-parser-js";let result,promise;export function getPlatformInfo(){return __awaiter(this,void 0,void 0,(function*(){return null==result&&(promise=null!=promise?promise:Promise.resolve(new UAParser(navigator.userAgent).getResult().withFeatureCheck().withClientHints()),result=Object.assign(Object.assign({},yield promise),{toStringObject(){return Object.getOwnPropertyNames(this).reduce(((t,e)=>{const r=e;return null!=this[r]&&"function"!=typeof this[r]&&(t[r]=this[r].toString()),t}),{})}}),promise=void 0),result}))}export function getCachedPlatformInfo(){return null==result&&(console.warn("PlatformInfo is not ready yet."),getPlatformInfo()),result}

package/platform/isAndroid.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";export function isAndroid(){const n=getCachedUAInfo();if(!n)return!1;const o=n.os.name;return"Android"===o||"Android-x86"===o}
+import{getCachedPlatformInfo}from"./getPlatformInfo";export function isAndroid(){const o=getCachedPlatformInfo();if(!o)return!1;const n=o.os.name;return"Android"===n||"Android-x86"===n}

package/platform/isIOS.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";import{isMobile}from"./isMobile";export function isIOS(){const e=getCachedUAInfo();return!!e&&("iOS"===e.os.name||isMobile()&&"Apple"===e.device.vendor)}
+import{getCachedPlatformInfo}from"./getPlatformInfo";import{isMobile}from"./isMobile";export function isIOS(){const o=getCachedPlatformInfo();return!!o&&("iOS"===o.os.name||isMobile()&&"Apple"===o.device.vendor)}

package/platform/isMacOS.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";import{isMobile}from"./isMobile";export function isMacOS(){const o=getCachedUAInfo();if(!o)return!1;const e=o.os.name;return("Mac OS"===e||"macOS"===e)&&!isMobile()}
+import{getCachedPlatformInfo}from"./getPlatformInfo";import{isMobile}from"./isMobile";export function isMacOS(){const o=getCachedPlatformInfo();if(!o)return!1;const t=o.os.name;return("Mac OS"===t||"macOS"===t)&&!isMobile()}

package/platform/isMobile.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";export function isMobile(){const e=getCachedUAInfo();if(!e)return!1;const o=e.device.type;return!!("mobile"===o||"tablet"===o||!o&&"Apple"===e.device.vendor&&navigator.maxTouchPoints&&navigator.maxTouchPoints>2)}
+import{getCachedPlatformInfo}from"./getPlatformInfo";export function isMobile(){const o=getCachedPlatformInfo();if(!o)return!1;const t=o.device.type;return!!("mobile"===t||"tablet"===t||!t&&"Apple"===o.device.vendor&&navigator.maxTouchPoints&&navigator.maxTouchPoints>2)}

package/platform/isSafari.js

@@ -1 +1 @@
-import{getCachedUAInfo}from"./ua";import{isIOS}from"./isIOS";import{isMacOS}from"./isMacOS";export function isSafari(){const i=getCachedUAInfo();if(!i)return!1;const r=i.browser.name;return"Safari"===r||"Mobile Safari"===r||"WebKit"===r&&(isIOS()||isMacOS())}
+import{getCachedPlatformInfo}from"./getPlatformInfo";import{isIOS}from"./isIOS";import{isMacOS}from"./isMacOS";export function isSafari(){const r=getCachedPlatformInfo();if(!r)return!1;const o=r.browser.name;return"Safari"===o||"Mobile Safari"===o||"WebKit"===o&&(isIOS()||isMacOS())}

package/platform/ua.d.ts

@@ -1,6 +0,0 @@
-type UAInfo = DeepReadonly<OmitStrict<UAParser.IResult, 'withClientHints' | 'withFeatureCheck'>> & {
-    toStringObject(): Record<Keys<ExcludeKeysOfType<UAParser.IResult, AnyFunction>>, string>;
-};
-export declare function getUAInfo(): Promise<UAInfo>;
-export declare function getCachedUAInfo(): UAInfo | undefined;
-export {};

package/platform/ua.js

@@ -1 +0,0 @@
-import{__awaiter}from"tslib";import{UAParser}from"ua-parser-js";let result,promise;export function getUAInfo(){return __awaiter(this,void 0,void 0,(function*(){return null==result&&(promise=null!=promise?promise:Promise.resolve(new UAParser(navigator.userAgent).getResult().withFeatureCheck().withClientHints()),result=Object.assign(Object.assign({},yield promise),{toStringObject(){return Object.getOwnPropertyNames(this).reduce(((e,t)=>{const r=t;return null!=this[r]&&"function"!=typeof this[r]&&(e[r]=this[r].toString()),e}),{})}}),promise=void 0),result}))}export function getCachedUAInfo(){return null==result&&(console.warn("UAInfo is not ready yet."),getUAInfo()),result}