@js-toolkit/web-utils 1.65.0 → 1.66.0

package/getPinchZoomHandlers.d.ts

@@ -0,0 +1,23 @@
+type TouchLike = Pick<Touch, 'pageX' | 'pageY' | 'clientX' | 'clientY'>;
+type TouchListLike = ArrayLike<TouchLike>;
+type TouchEventLike = Override<Pick<TouchEvent, 'touches' | 'preventDefault' | 'stopPropagation'>, {
+    touches: TouchListLike;
+}> & {
+    readonly scale?: number;
+};
+type ActionType = 'zoom' | 'move';
+interface PinchZoomHandlers<E extends TouchEventLike = TouchEventLike> {
+    onTouchStart: (event: E) => void;
+    onTouchMove: (event: E) => void;
+    onTouchEnd: (event: E) => void;
+    getState: () => ActionType | undefined;
+}
+export interface GetPinchZoomHandlersOptions<E extends TouchEventLike = TouchEventLike> {
+    canStart: (action: ActionType, event: E) => boolean;
+    onUpdate: (deltaScale: number, deltaOffsetX: number, deltaOffsetY: number) => void;
+    onEnd: (x?: number, y?: number) => void;
+    getBounds?: () => [target: DOMRect, bounds: DOMRect];
+    acceleration?: number;
+}
+export declare function getPinchZoomHandlers<E extends TouchEventLike = TouchEventLike>({ canStart, onUpdate, onEnd, getBounds, acceleration, }: GetPinchZoomHandlersOptions<E>): PinchZoomHandlers<E>;
+export {};

package/getPinchZoomHandlers.js

@@ -0,0 +1 @@
+import{preventDefault}from"./preventDefault";function getDistanceBetweenFingers(e,t){return Math.hypot(t.pageX-e.pageX,t.pageY-e.pageY)}function getPoint(e,t){return t?{x:(e.pageX+t.pageX)/2,y:(e.pageY+t.pageY)/2}:{x:e.pageX,y:e.pageY}}export function getPinchZoomHandlers({canStart:e,onUpdate:t,onEnd:o,getBounds:n,acceleration:i=2}){const c={x:0,y:0,distance:0};let s,g=1,h=0,a=0,r=!1;const l=e=>{s||(r=!1),s=e.touches.length>=2?"zoom":"move",h=0,a=0,"zoom"===s&&(g=1);const t=e.touches[0],o=e.touches[1];Object.assign(c,getPoint(t,o)),c.distance=o?getDistanceBetweenFingers(t,o):0},u=(e,t)=>{s=void 0,o(e,t)};return{onTouchStart:t=>{t.touches.length>2||e(s??"move",t)&&(l(t),"zoom"===s&&preventDefault(t))},onTouchMove:e=>{if(null==s)return;preventDefault(e);const o=e.touches[0],n=e.touches[1],l=getPoint(o,n),u=(l.x-c.x)*i,p=(l.y-c.y)*i,d=u-h,f=p-a;if(h=u,a=p,r=!0,n&&"zoom"===s){const e=getDistanceBetweenFingers(o,n)/c.distance,i=e-g;g=e,t(i,d,f)}else t(0,d,f)},onTouchEnd:e=>{if(s)if(r&&preventDefault(e),1!==e.touches.length){if(!(e.touches.length>0)){if(n&&r){const[e,t]=n(),o=e.left+window.scrollX>t.left,i=e.top+window.scrollY>t.top,c=e.right+window.scrollX<t.right,s=e.bottom+window.scrollY<t.bottom;if(o||i||c||s){const n=o||c?((e.width-t.width)/2||0)-(c?e.width-t.width:0):0,g=i||s?((e.height-t.height)/2||0)-(s?e.height-t.height:0):0;return void u(n,g)}}u()}}else l(e)},getState:()=>s}}

package/{ga → metrics/ga}/DataLayerProxy.d.ts

@@ -1,6 +1,6 @@
+import type { DataLayer } from '../types';
 import { type GAEventData, type GAEventDataTransformerMap } from './getHandler';
-export type { GAEventData };
-export declare class DataLayerProxy<D extends GAEventData> {
+export declare class DataLayerProxy<D extends GAEventData> implements DataLayer<D> {
     private readonly handler;
     constructor(transformers: GAEventDataTransformerMap<D>);
     push(data: D): void;

package/metrics/ga/DataLayerProxy.js

@@ -0,0 +1 @@
+import{getHandler}from"./getHandler";export class DataLayerProxy{handler;constructor(r){const t=getHandler("auto",r);this.handler=t}push(r){this.handler(r)}}

package/{ga → metrics/ga}/getHandler.d.ts

@@ -1,11 +1,10 @@
-import { type GAEventMessage } from './iframeMessenger';
 import type { GTMEventData } from './types';
 export interface GAEventData {
     readonly eventCategory: string;
-    readonly action: string;
+    readonly eventType: string;
     readonly label: string | undefined;
     /**
-     * Идентификатор потока данных
+     * Идентификатор потока данных (номер счетчика в других системах)
      * (https://support.google.com/analytics/answer/12270356?hl=ru).
      *
      * Можно не указывать, если:
@@ -14,14 +13,18 @@ export interface GAEventData {
      */
     readonly measurementId: string | undefined;
 }
+export interface GAIFrameMessage<T extends string = string, D extends GAEventData = GAEventData> {
+    type: T;
+    event: D;
+}
 export interface GADataHandler<D extends GAEventData> {
     (data: D): void;
 }
 type GALibType = 'gtm' | 'gtag' | /* 'ga' | */ 'iframe' | 'auto';
-export type GAEventDataTransformer<D extends GAEventData, L extends Extract<GALibType, 'gtm' | 'iframe'>> = (data: D) => {
+type GAEventDataTransformer<D extends GAEventData, L extends Extract<GALibType, 'gtm' | 'iframe'>> = (data: D) => {
     readonly gtm: GTMEventData;
-    readonly iframe: GAEventMessage<string, D>;
+    readonly iframe: GAIFrameMessage<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;
+export declare function getHandler<D extends GAEventData, L extends GALibType>(gaLib: L, transformers: L extends 'gtag' ? undefined : GAEventDataTransformerMap<D>): GADataHandler<D>;
 export {};

package/metrics/ga/getHandler.js

@@ -0,0 +1 @@
+import{UnreachableCaseError}from"@js-toolkit/utils/UnreachableCaseError";function gtmHandler(e,r,t){e.push(r(t))}function gtagHandler(e,r){const{eventType:t,eventCategory:n,measurementId:a,label:o}=r;e("event",t,{send_to:a,event_category:n,event_label:o,value:void 0})}function iframeHandler(e,r){window.parent.postMessage({type:e,event:r},"*")}export function getHandler(e,r){switch(e){case"auto":if(window.gtag)return getHandler("gtag",void 0);if(window.dataLayer)return getHandler("gtm",r);if(window.parent!==window)return getHandler("iframe",r);throw new Error("Unable to create auto handler due to Google Analytics is not configured or current window is not inside iframe.");case"iframe":return e=>{const t=r.iframe(e);iframeHandler(t.type,t.event)};case"gtm":{const{dataLayer:e}=window;if(!e)throw new Error("Unable to create handler: `dataLayer` is undefined.");return t=>{gtmHandler(e,r.gtm,t)}}case"gtag":{const{gtag:e}=window;if(!e)throw new Error("Unable to create handler: `gtag` is undefined.");return r=>{gtagHandler(e,r)}}default:throw new UnreachableCaseError(e,`Unknown GA lib type '${e}'.`)}}

package/{ga → metrics/ga}/types.d.ts

@@ -2,7 +2,7 @@ export interface GTMEventData {
     event: string;
 }
 interface GTMDataLayer<D extends GTMEventData> {
-    push: (data: D) => unknown;
+    push(data: D): unknown;
 }
 interface GTagEventData {
     event_category: string;

package/metrics/types.d.ts

@@ -0,0 +1,3 @@
+export interface DataLayer<D extends AnyObject> {
+    push(data: D): unknown;
+}

package/metrics/types.js

@@ -0,0 +1 @@
+export{};

package/metrics/yandex/DataLayerProxy.d.ts

@@ -0,0 +1,7 @@
+import type { DataLayer } from '../types';
+import { type YAEventDataTransformerMap, type YaLibType, type YMEventData } from './getHandler';
+export declare class DataLayerProxy<D extends YMEventData> implements DataLayer<D> {
+    private readonly handler;
+    constructor(lib: YaLibType, transformers: YAEventDataTransformerMap<D>);
+    push(data: D): void;
+}

package/metrics/yandex/DataLayerProxy.js

@@ -0,0 +1 @@
+import{getHandler}from"./getHandler";export class DataLayerProxy{handler;constructor(r,e){const t=getHandler(r,e);this.handler=t}push(r){this.handler(r)}}

package/metrics/yandex/getHandler.d.ts

@@ -0,0 +1,18 @@
+import type { YTMEventData } from './types';
+export type YMEventData = AnyObject;
+export interface YaIFrameMessage<T extends string = string, D extends YMEventData = YMEventData> {
+    type: T;
+    event: D;
+}
+export interface YaDataHandler<D extends YMEventData> {
+    (data: D): void;
+}
+export type YaLibType = 'ym' | 'ytm' | 'iframe' | 'auto';
+type YAEventDataTransformer<D extends YMEventData, L extends ExtractStrict<YaLibType, 'ytm' | 'ym' | 'iframe'>> = (data: D) => {
+    ytm: YTMEventData;
+    ym: [counterId: string, fn: 'reachGoal', target: string, params: AnyObject] | [counterId: string, fn: 'params', params: AnyObject];
+    iframe: YaIFrameMessage<string, D>;
+}[L];
+export type YAEventDataTransformerMap<D extends YMEventData, L extends ExtractStrict<YaLibType, 'ytm' | 'ym' | 'iframe'> = 'ytm' | 'ym' | 'iframe'> = L extends L ? Record<L, YAEventDataTransformer<D, L>> : never;
+export declare function getHandler<D extends YMEventData, L extends YaLibType>(yaLib: L, transformers: YAEventDataTransformerMap<D>): YaDataHandler<D>;
+export {};

package/metrics/yandex/getHandler.js

@@ -0,0 +1 @@
+import{UnreachableCaseError}from"@js-toolkit/utils/UnreachableCaseError";function ytmHandler(e,r,n){e.push(r(n))}function ymHandler(e,r,n){const[t,a,...o]=r(n);e(t,a,...o)}function iframeHandler(e,r){window.parent.postMessage({type:e,event:r},"*")}export function getHandler(e,r){switch(e){case"auto":if(window.ym)return getHandler("ym",r);if(window.dataLayer)return getHandler("ytm",r);if(window.parent!==window)return getHandler("iframe",r);throw new Error("Unable to create auto handler due to Yandex Metrics is not configured or current window is not inside iframe.");case"iframe":return e=>{const n=r.iframe(e);iframeHandler(n.type,n.event)};case"ytm":{const{dataLayer:e}=window;if(!e)throw new Error("Unable to create handler: `dataLayer` is undefined.");return n=>{ytmHandler(e,r.ytm,n)}}case"ym":{const{ym:e}=window;if(!e)throw new Error("Unable to create handler: `ym` is undefined.");return n=>{ymHandler(e,r.ym,n)}}default:throw new UnreachableCaseError(e,`Unknown Ya lib type '${e}'.`)}}

package/metrics/yandex/types.d.ts

@@ -0,0 +1,13 @@
+export interface YTMEventData {
+    event: string;
+}
+interface Ym {
+    (counterId: string, fn: string, ...rest: unknown[]): void;
+}
+declare global {
+    interface Window {
+        /** Yandex Metrics */
+        ym?: Ym;
+    }
+}
+export {};

package/metrics/yandex/types.js

@@ -0,0 +1 @@
+export{};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-toolkit/web-utils",
-  "version": "1.65.0",
+  "version": "1.66.0",
   "description": "Web utils",
   "author": "VZH",
   "license": "MIT",
@@ -17,33 +17,33 @@
     "minor-publish": "npm run build && npm version minor --force --no-workspaces-update -m 'v%s' && npm run copy:configs && cd ./dist && npm publish --access public && git push --follow-tags"
   },
   "optionalDependencies": {
-    "@js-toolkit/node-utils": "^1.2.6"
+    "@js-toolkit/node-utils": "1.2.6"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.2",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.33.0",
-    "@js-toolkit/configs": "^3.95.1",
-    "@js-toolkit/utils": "^1.60.1",
-    "@types/eslint": "^9.6.1",
-    "@types/lodash.throttle": "^4.1.9",
-    "@types/uuid": "^10.0.0",
-    "copyfiles": "^2.4.1",
-    "eslint": "^9.33.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.4",
-    "lodash.throttle": "^4.1.1",
-    "prettier": "^3.6.2",
-    "reconnecting-websocket": "^4.4.0",
-    "rimraf": "^6.0.1",
-    "terser": "^5.43.1",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.40.0",
-    "ua-parser-js": "^2.0.4",
-    "uuid": "^11.1.0",
-    "webpack": "^5.101.3",
-    "yargs": "^18.0.0"
+    "@eslint/compat": "2.0.0",
+    "@eslint/eslintrc": "3.3.3",
+    "@eslint/js": "9.39.2",
+    "@js-toolkit/configs": "3.99.0",
+    "@js-toolkit/utils": "1.60.3",
+    "@types/eslint": "9.6.1",
+    "@types/lodash.throttle": "4.1.9",
+    "@types/uuid": "11.0.0",
+    "copyfiles": "2.4.1",
+    "eslint": "9.39.2",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-import-resolver-typescript": "4.4.4",
+    "eslint-plugin-import-x": "4.16.1",
+    "eslint-plugin-prettier": "5.5.4",
+    "lodash.throttle": "4.1.1",
+    "prettier": "3.7.4",
+    "reconnecting-websocket": "4.4.0",
+    "rimraf": "6.1.2",
+    "terser": "5.44.1",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.50.0",
+    "ua-parser-js": "2.0.7",
+    "uuid": "13.0.0",
+    "webpack": "5.104.0",
+    "yargs": "18.0.0"
   }
 }

package/platform/getIOSVersion.js

@@ -1 +1 @@
-import{getCachedPlatformInfo}from"./getPlatformInfo";import{isIOS}from"./isIOS";import{Semver}from"./Semver";let memo;export function getIOSVersion(){if(void 0===memo){const o=getCachedPlatformInfo();if(!o)return;const{os:e}=o;memo=isIOS()&&e.version?Semver.parse(e.version):null}return memo??void 0}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";import{isIOS}from"./isIOS";import{Semver}from"./Semver";let memo;export function getIOSVersion(){if(void 0===memo){const o=getCachedPlatformInfo()??getPlatformInfoSync();if(!o)return;const{os:e}=o;memo=isIOS()&&e.version?Semver.parse(e.version):null}return memo??void 0}

package/platform/getPlatformInfo.js

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

package/platform/isAndroid.js

@@ -1 +1 @@
-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}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";export function isAndroid(){const o=(getCachedPlatformInfo()??getPlatformInfoSync()).os.name;return"Android"===o||"Android-x86"===o}

package/platform/isChrome.js

@@ -1 +1 @@
-import{getCachedPlatformInfo}from"./getPlatformInfo";export function isChrome(){const o=getCachedPlatformInfo();if(!o)return!1;const r=o.browser.name;return"Chrome"===r||"Mobile Chrome"===r}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";export function isChrome(){const o=(getCachedPlatformInfo()??getPlatformInfoSync()).browser.name;return"Chrome"===o||"Mobile Chrome"===o}

package/platform/isIOS.js

@@ -1 +1 @@
-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)}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";import{isMobile}from"./isMobile";export function isIOS(){const o=getCachedPlatformInfo()??getPlatformInfoSync();return"iOS"===o.os.name||isMobile()&&"Apple"===o.device.vendor}

package/platform/isMacOS.js

@@ -1 +1 @@
-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()}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";import{isMobile}from"./isMobile";export function isMacOS(){const o=(getCachedPlatformInfo()??getPlatformInfoSync()).os.name;return("Mac OS"===o||"macOS"===o)&&!isMobile()}

package/platform/isMobile.js

@@ -1 +1 @@
-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)}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";export function isMobile(){const o=getCachedPlatformInfo()??getPlatformInfoSync(),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{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())}
+import{getCachedPlatformInfo,getPlatformInfoSync}from"./getPlatformInfo";import{isIOS}from"./isIOS";import{isMacOS}from"./isMacOS";export function isSafari(){const o=(getCachedPlatformInfo()??getPlatformInfoSync()).browser.name;return"Safari"===o||"Mobile Safari"===o||"WebKit"===o&&(isIOS()||isMacOS())}

package/ga/DataLayerProxy.js

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

package/ga/getHandler.js

@@ -1 +0,0 @@
-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/iframeMessenger.d.ts

@@ -1,6 +0,0 @@
-import type { GAEventData } from './getHandler';
-export interface GAEventMessage<T extends string = string, D extends GAEventData = GAEventData> {
-    type: T;
-    event: D;
-}
-export declare function iframeMessenger<T extends string, D extends GAEventData>(type: T, data: D): void;

package/ga/iframeMessenger.js

@@ -1 +0,0 @@
-export function iframeMessenger(e,n){window.parent.postMessage({type:e,event:n},"*")}